fix(webhook): make label selectors unambiguous (backport #926) (#927)

* fix(webhook): make label selectors unambiguous (#926) (cherry picked from commit 25de979) # Conflicts: # bundle/manifests/cryostat-operator.clusterserviceversion.yaml * Fix conflicts --------- Co-authored-by: Elliott Baron <[email protected]>
cryostatio · Jul 31, 2024 · c17fe4c · c17fe4c
1 parent 61844db
commit c17fe4c
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 28 deletions.
diff --git a/...fests/cryostat-operator-cryostat-namespaced_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...fests/cryostat-operator-cryostat-namespaced_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: cryostat-operator
   name: cryostat-operator-cryostat-namespaced
 rules:
 - apiGroups:

diff --git a/bundle/manifests/cryostat-operator-cryostat_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/cryostat-operator-cryostat_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: cryostat-operator
   name: cryostat-operator-cryostat
 rules:
 - apiGroups:

diff --git a/bundle/manifests/cryostat-operator-manager-config_v1_configmap.yaml b/bundle/manifests/cryostat-operator-manager-config_v1_configmap.yaml
@@ -14,4 +14,6 @@ data:
       resourceName: d696d7ab.redhat.com
 kind: ConfigMap
 metadata:
+  labels:
+    app.kubernetes.io/name: cryostat-operator
   name: cryostat-operator-manager-config
diff --git a/...le/manifests/cryostat-operator-oauth-client_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...le/manifests/cryostat-operator-oauth-client_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: cryostat-operator
   name: cryostat-operator-oauth-client
 rules:
 - apiGroups:

diff --git a/bundle/manifests/cryostat-operator-webhook-service_v1_service.yaml b/bundle/manifests/cryostat-operator-webhook-service_v1_service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/created-by: cryostat-operator
     app.kubernetes.io/instance: webhook-service
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/name: service
+    app.kubernetes.io/name: cryostat-operator
     app.kubernetes.io/part-of: cryostat-operator
   name: cryostat-operator-webhook-service
 spec:
@@ -16,6 +16,7 @@ spec:
     protocol: TCP
     targetPort: 9443
   selector:
+    app.kubernetes.io/name: cryostat-operator
     control-plane: controller-manager
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -30,7 +30,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
-    createdAt: "2024-07-09T15:20:45Z"
+    createdAt: "2024-07-31T13:59:44Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -970,19 +970,22 @@ spec:
           serviceAccountName: cryostat-operator-service-account
       deployments:
         - label:
+            app.kubernetes.io/name: cryostat-operator
             control-plane: controller-manager
           name: cryostat-operator-controller-manager
           spec:
             replicas: 1
             selector:
               matchLabels:
+                app.kubernetes.io/name: cryostat-operator
                 control-plane: controller-manager
             strategy: {}
             template:
               metadata:
                 annotations:
                   kubectl.kubernetes.io/default-container: manager
                 labels:
+                  app.kubernetes.io/name: cryostat-operator
                   control-plane: controller-manager
               spec:
                 containers:
@@ -1046,21 +1049,12 @@ spec:
                       capabilities:
                         drop:
                           - ALL
-                    volumeMounts:
-                      - mountPath: /tmp/k8s-webhook-server/serving-certs
-                        name: cert
-                        readOnly: true
                 securityContext:
                   runAsNonRoot: true
                   seccompProfile:
                     type: RuntimeDefault
                 serviceAccountName: cryostat-operator-service-account
                 terminationGracePeriodSeconds: 10
-                volumes:
-                  - name: cert
-                    secret:
-                      defaultMode: 420
-                      secretName: webhook-server-cert
       permissions:
         - rules:
             - apiGroups:

diff --git a/bundle/manifests/operator.cryostat.io_cryostats.yaml b/bundle/manifests/operator.cryostat.io_cryostats.yaml
@@ -5,6 +5,8 @@ metadata:
     cert-manager.io/inject-ca-from: cryostat-operator-system/cryostat-operator-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
+  labels:
+    app.kubernetes.io/name: cryostat-operator
   name: cryostats.operator.cryostat.io
 spec:
   conversion:

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -9,8 +9,8 @@ namespace: cryostat-operator-system
 namePrefix: cryostat-operator-
 
 # Labels to add to all resources and selectors.
-#commonLabels:
-#  someName: someValue
+commonLabels:
+  app.kubernetes.io/name: cryostat-operator
 
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics

diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -11,18 +11,18 @@ patchesJson6902:
     version: v1alpha1
     kind: ClusterServiceVersion
     name: cryostat-operator.v0.0.0
-#- target:
-#    group: apps
-#    version: v1
-#    kind: Deployment
-#    name: controller-manager
-#    namespace: system
-#  patch: |-
-#    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
-#    # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
-#    - op: remove
-#      path: /spec/template/spec/containers/1/volumeMounts/0
-#    # Remove the "cert" volume, since OLM will create and mount a set of certs.
-#    # Update the indices in this path if adding or removing volumes in the manager's Deployment.
-#    - op: remove
-#      path: /spec/template/spec/volumes/0
+- target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: controller-manager
+    namespace: system
+  patch: |-
+    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
+    # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
+    - op: remove
+      path: /spec/template/spec/containers/0/volumeMounts/0
+    # Remove the "cert" volume, since OLM will create and mount a set of certs.
+    # Update the indices in this path if adding or removing volumes in the manager's Deployment.
+    - op: remove
+      path: /spec/template/spec/volumes/0