rh-ecosystem-edge · openshift-merge-bot · Nov 16, 2023 · Nov 15, 2023
diff --git a/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml b/bundle-hub/manifests/kernel-module-management-hub.clusterserviceversion.yaml
@@ -166,22 +166,22 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: kmm-operator-hub-controller-manager
+        serviceAccountName: kmm-operator-hub-controller
       deployments:
       - label:
           app.kubernetes.io/component: kmm-hub
           app.kubernetes.io/name: kmm-hub
           app.kubernetes.io/part-of: kmm
-          control-plane: controller-manager
-        name: kmm-operator-hub-controller-manager
+          control-plane: controller
+        name: kmm-operator-hub-controller
         spec:
           replicas: 1
           selector:
             matchLabels:
               app.kubernetes.io/component: kmm-hub
               app.kubernetes.io/name: kmm-hub
               app.kubernetes.io/part-of: kmm
-              control-plane: controller-manager
+              control-plane: controller
           strategy: {}
           template:
             metadata:
@@ -191,11 +191,11 @@ spec:
                 app.kubernetes.io/component: kmm-hub
                 app.kubernetes.io/name: kmm-hub
                 app.kubernetes.io/part-of: kmm
-                control-plane: controller-manager
+                control-plane: controller
             spec:
               containers:
               - args:
-                - --config=controller_manager_config.yaml
+                - --config=controller_config.yaml
                 command:
                 - /usr/local/bin/manager
                 env:
@@ -247,9 +247,9 @@ spec:
                 - mountPath: /etc/pki/ca-trust/extracted/pem
                   name: trusted-ca
                   readOnly: true
-                - mountPath: /controller_manager_config.yaml
+                - mountPath: /controller_config.yaml
                   name: manager-config
-                  subPath: controller_manager_config.yaml
+                  subPath: controller_config.yaml
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
@@ -279,7 +279,7 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: kmm-operator-hub-controller-manager
+              serviceAccountName: kmm-operator-hub-controller
               terminationGracePeriodSeconds: 10
               tolerations:
               - effect: NoSchedule
@@ -332,7 +332,7 @@ spec:
           - update
           - patch
           - delete
-        serviceAccountName: kmm-operator-hub-controller-manager
+        serviceAccountName: kmm-operator-hub-controller
     strategy: deployment
   installModes:
   - supported: true
@@ -361,7 +361,7 @@ spec:
   - admissionReviewVersions:
     - v1
     containerPort: 443
-    deploymentName: kmm-operator-hub-controller-manager
+    deploymentName: kmm-operator-hub-controller
     failurePolicy: Fail
     generateName: vmanagedclustermodule.kb.io
     rules:

diff --git a/...r-manager-metrics-service_v1_service.yaml → ...ontroller-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...ontroller-metrics-service_v1_service.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-hub-controller-manager-metrics-service
+    control-plane: controller
+  name: kmm-operator-hub-controller-metrics-service
 spec:
   ports:
   - name: https
@@ -18,6 +18,6 @@ spec:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml b/bundle-hub/manifests/kmm-operator-hub-manager-config_v1_configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  controller_manager_config.yaml: |
+  controller_config.yaml: |
     healthProbeBindAddress: :8081
     metricsBindAddress: 127.0.0.1:8080
     webhookPort: 9443

diff --git a/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml b/bundle-hub/manifests/kmm-operator-hub-webhook-service_v1_service.yaml
@@ -21,6 +21,6 @@ spec:
     app.kubernetes.io/component: kmm-hub
     app.kubernetes.io/name: kmm-hub
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/kernel-module-management.clusterserviceversion.yaml b/bundle/manifests/kernel-module-management.clusterserviceversion.yaml
@@ -301,22 +301,22 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: kmm-operator-controller-manager
+        serviceAccountName: kmm-operator-controller
       deployments:
       - label:
           app.kubernetes.io/component: kmm
           app.kubernetes.io/name: kmm
           app.kubernetes.io/part-of: kmm
-          control-plane: controller-manager
-        name: kmm-operator-controller-manager
+          control-plane: controller
+        name: kmm-operator-controller
         spec:
           replicas: 1
           selector:
             matchLabels:
               app.kubernetes.io/component: kmm
               app.kubernetes.io/name: kmm
               app.kubernetes.io/part-of: kmm
-              control-plane: controller-manager
+              control-plane: controller
           strategy: {}
           template:
             metadata:
@@ -326,11 +326,11 @@ spec:
                 app.kubernetes.io/component: kmm
                 app.kubernetes.io/name: kmm
                 app.kubernetes.io/part-of: kmm
-                control-plane: controller-manager
+                control-plane: controller
             spec:
               containers:
               - args:
-                - --config=controller_manager_config.yaml
+                - --config=controller_config.yaml
                 command:
                 - /usr/local/bin/manager
                 env:
@@ -384,9 +384,9 @@ spec:
                 - mountPath: /etc/pki/ca-trust/extracted/pem
                   name: trusted-ca
                   readOnly: true
-                - mountPath: /controller_manager_config.yaml
+                - mountPath: /controller_config.yaml
                   name: manager-config
-                  subPath: controller_manager_config.yaml
+                  subPath: controller_config.yaml
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
@@ -416,7 +416,7 @@ spec:
                 runAsNonRoot: true
                 seccompProfile:
                   type: RuntimeDefault
-              serviceAccountName: kmm-operator-controller-manager
+              serviceAccountName: kmm-operator-controller
               terminationGracePeriodSeconds: 10
               tolerations:
               - effect: NoSchedule
@@ -469,7 +469,7 @@ spec:
           - update
           - patch
           - delete
-        serviceAccountName: kmm-operator-controller-manager
+        serviceAccountName: kmm-operator-controller
       - rules:
         - apiGroups:
           - security.openshift.io
@@ -518,7 +518,7 @@ spec:
   - admissionReviewVersions:
     - v1
     containerPort: 443
-    deploymentName: kmm-operator-controller-manager
+    deploymentName: kmm-operator-controller
     failurePolicy: Fail
     generateName: vmodule.kb.io
     rules:

diff --git a/...itoring.coreos.com_v1_servicemonitor.yaml → ...itoring.coreos.com_v1_servicemonitor.yaml b/...itoring.coreos.com_v1_servicemonitor.yaml → ...itoring.coreos.com_v1_servicemonitor.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-controller-manager-metrics-monitor
+    control-plane: controller
+  name: kmm-operator-controller-metrics-monitor
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -17,4 +17,4 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller
diff --git a/...r-manager-metrics-service_v1_service.yaml → ...ontroller-metrics-service_v1_service.yaml b/...r-manager-metrics-service_v1_service.yaml → ...ontroller-metrics-service_v1_service.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
-  name: kmm-operator-controller-manager-metrics-service
+    control-plane: controller
+  name: kmm-operator-controller-metrics-service
 spec:
   ports:
   - name: https
@@ -18,6 +18,6 @@ spec:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml b/bundle/manifests/kmm-operator-manager-config_v1_configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  controller_manager_config.yaml: |
+  controller_config.yaml: |
     healthProbeBindAddress: :8081
     metricsBindAddress: 127.0.0.1:8080
     leaderElection:

diff --git a/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml b/bundle/manifests/kmm-operator-webhook-service_v1_service.yaml
@@ -21,6 +21,6 @@ spec:
     app.kubernetes.io/component: kmm
     app.kubernetes.io/name: kmm
     app.kubernetes.io/part-of: kmm
-    control-plane: controller-manager
+    control-plane: controller
 status:
   loadBalancer: {}
diff --git a/ci/install-ci-spoke/kustomization.yaml b/ci/install-ci-spoke/kustomization.yaml
@@ -9,7 +9,7 @@ patchesStrategicMerge:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: controller-manager
+      name: controller
       namespace: system
     spec:
       template:

diff --git a/ci/prow/e2e-hub-spoke-incluster-build b/ci/prow/e2e-hub-spoke-incluster-build
@@ -36,15 +36,15 @@ if [ "$SKIP_MAKE_DEPLOY_HUB" == true ]; then
 else
   echo "Deploy KMMO-Hub..."
   make deploy-hub KUSTOMIZE_CONFIG_HUB_DEFAULT=ci/install-ci-hub
-  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-hub-controller-manager -n ${OPERATOR_NAMESPACE}
+  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-hub-controller -n ${OPERATOR_NAMESPACE}
 fi
 
 if [ "$SKIP_MAKE_DEPLOY" == true ]; then
   echo "Skipping KMM deployment"
 else
   echo "Deploy KMM..."
   make deploy KUSTOMIZE_CONFIG_DEFAULT=ci/install-ci-spoke
-  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-controller-manager -n ${OPERATOR_NAMESPACE}
+  oc wait --for=condition=Available --timeout=1m deployment/kmm-operator-controller -n ${OPERATOR_NAMESPACE}
 fi
 
 # Apply the ManagedClusterModule

diff --git a/ci/prow/e2e-incluster-build b/ci/prow/e2e-incluster-build
@@ -47,7 +47,7 @@ oc apply -f ci/kmm-kmod-dockerfile.yaml
 echo "Add Secrets containing the signing key and certificate..."
 oc apply -f ci/secret_kmm-kmod-signing.yaml
 
-oc wait --for=condition=Available deployment/kmm-operator-controller-manager -n openshift-kmm
+oc wait --for=condition=Available deployment/kmm-operator-controller -n openshift-kmm
 
 echo "Add an kmm-ci Module that contains a valid mapping..."
 oc apply -f ci/module-kmm-ci-build-sign.yaml

diff --git a/config/default-hub/kustomizeconfig.yaml b/config/default-hub/kustomizeconfig.yaml
@@ -1,4 +1,4 @@
 namePrefix:
 - kind: Deployment
-  name: controller-manager
+  name: controller
   path: spec/template/spec/volumes/secret/secretName
diff --git a/config/default-hub/manager_webhook_patch.yaml b/config/default-hub/manager_webhook_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/config/default/kustomizeconfig.yaml b/config/default/kustomizeconfig.yaml
@@ -1,4 +1,4 @@
 namePrefix:
 - kind: Deployment
-  name: controller-manager
+  name: controller
   path: spec/template/spec/volumes/secret/secretName
diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/config/manager-base/manager.yaml b/config/manager-base/manager.yaml
@@ -2,29 +2,29 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: controller
     security.openshift.io/scc.podSecurityLabelSync: 'true'
     openshift.io/cluster-monitoring: "true"
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: controller
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: controller
     spec:
       affinity:
         nodeAffinity:
@@ -74,7 +74,7 @@ spec:
           requests:
             cpu: 10m
             memory: 64Mi
-      serviceAccountName: controller-manager
+      serviceAccountName: controller
       terminationGracePeriodSeconds: 10
       tolerations:
         - key: node-role.kubernetes.io/master

diff --git a/config/manager-base/manager_auth_proxy_patch.yaml b/config/manager-base/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
@@ -30,4 +30,4 @@ spec:
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
-            drop: [ALL]
+            drop: [ALL]
diff --git a/config/manager-base/manager_config_patch.yaml b/config/manager-base/manager_config_patch.yaml
@@ -1,19 +1,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:
     spec:
       containers:
       - name: manager
         args:
-        - "--config=controller_manager_config.yaml"
+        - "--config=controller_config.yaml"
         volumeMounts:
         - name: manager-config
-          mountPath: /controller_manager_config.yaml
-          subPath: controller_manager_config.yaml
+          mountPath: /controller_config.yaml
+          subPath: controller_config.yaml
       volumes:
       - name: manager-config
         configMap: