fix(olm): rename deployment to handle immutable selector (#943)

(cherry picked from commit 07403b0) # Conflicts: # bundle/manifests/cryostat-operator.clusterserviceversion.yaml
cryostatio · Sep 11, 2024 · 4a5b9a8 · 4a5b9a8
1 parent e89bc55
commit 4a5b9a8
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -514,7 +514,7 @@ deploy: check_cert_manager manifests kustomize predeploy undeploy ## Deploy cont
 	$(KUSTOMIZE) build $(KUSTOMIZE_DIR) | $(CLUSTER_CLIENT) create -f -
 ifeq ($(DISABLE_SERVICE_TLS), true)
 	@echo "Disabling TLS for in-cluster communication between Services"
-	@$(CLUSTER_CLIENT) -n $(DEPLOY_NAMESPACE) set env deployment/cryostat-operator-controller-manager DISABLE_SERVICE_TLS=true
+	@$(CLUSTER_CLIENT) -n $(DEPLOY_NAMESPACE) set env deployment/cryostat-operator-controller DISABLE_SERVICE_TLS=true
 endif
 
 .PHONY: undeploy

diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -29,8 +29,13 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
+<<<<<<< HEAD
     containerImage: quay.io/cryostat/cryostat-operator:3.0.1-dev
     createdAt: "2024-08-07T21:05:35Z"
+=======
+    containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
+    createdAt: "2024-09-11T16:26:11Z"
+>>>>>>> 07403b0 (fix(olm): rename deployment to handle immutable selector (#943))
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -972,7 +977,7 @@ spec:
         - label:
             app.kubernetes.io/name: cryostat-operator
             control-plane: controller-manager
-          name: cryostat-operator-controller-manager
+          name: cryostat-operator-controller
           spec:
             replicas: 1
             selector:
@@ -1186,7 +1191,7 @@ spec:
       containerPort: 443
       conversionCRDs:
         - cryostats.operator.cryostat.io
-      deploymentName: cryostat-operator-controller-manager
+      deploymentName: cryostat-operator-controller
       generateName: ccryostats.kb.io
       sideEffects: None
       targetPort: 9443
@@ -1195,7 +1200,7 @@ spec:
     - admissionReviewVersions:
         - v1
       containerPort: 443
-      deploymentName: cryostat-operator-controller-manager
+      deploymentName: cryostat-operator-controller
       failurePolicy: Fail
       generateName: mcryostat.kb.io
       rules:
@@ -1215,7 +1220,7 @@ spec:
     - admissionReviewVersions:
         - v1
       containerPort: 443
-      deploymentName: cryostat-operator-controller-manager
+      deploymentName: cryostat-operator-controller
       failurePolicy: Fail
       generateName: vcryostat.kb.io
       rules:

diff --git a/config/default/image_pull_patch.yaml b/config/default/image_pull_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/image_tag_patch.yaml b/config/default/image_tag_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/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_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/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/insights/insights_patch.yaml b/config/insights/insights_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/kustomization.yaml b/config/manager/kustomization.yaml
@@ -9,7 +9,7 @@ generatorOptions:
 #   target:
 #     group: apps
 #     kind: Deployment
-#     name: controller-manager
+#     name: controller
 #     namespace: system
 #     version: v1
 

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
   labels:
     control-plane: controller-manager

diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -15,7 +15,7 @@ patchesJson6902:
     group: apps
     version: v1
     kind: Deployment
-    name: controller-manager
+    name: controller
     namespace: system
   patch: |-
     # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.

diff --git a/hack/image_pull_patch.yaml.in b/hack/image_pull_patch.yaml.in
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/hack/image_tag_patch.yaml.in b/hack/image_tag_patch.yaml.in
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/hack/insights_patch.yaml.in b/hack/insights_patch.yaml.in
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller-manager
+  name: controller
   namespace: system
 spec:
   template:

diff --git a/internal/controllers/common/resource_definitions/resource_definitions.go b/internal/controllers/common/resource_definitions/resource_definitions.go
@@ -98,7 +98,7 @@ func NewDeploymentForCR(cr *model.CryostatInstance, specs *ServiceSpecs, imageTa
 		"app.kubernetes.io/name": "cryostat",
 	}
 	defaultDeploymentAnnotations := map[string]string{
-		"app.openshift.io/connects-to": "cryostat-operator-controller-manager",
+		"app.openshift.io/connects-to": constants.OperatorDeploymentName,
 	}
 	defaultPodLabels := map[string]string{
 		"app":       cr.Name,

diff --git a/internal/controllers/constants/constants.go b/internal/controllers/constants/constants.go
@@ -29,7 +29,7 @@ const (
 	DatabasePort               int32  = 5432
 	LoopbackAddress            string = "127.0.0.1"
 	OperatorNamePrefix         string = "cryostat-operator-"
-	OperatorDeploymentName     string = "cryostat-operator-controller-manager"
+	OperatorDeploymentName     string = "cryostat-operator-controller"
 	HttpPortName               string = "http"
 	// CAKey is the key for a CA certificate within a TLS secret
 	CAKey = certMeta.TLSCAKey

diff --git a/internal/controllers/reconciler_test.go b/internal/controllers/reconciler_test.go
@@ -312,7 +312,7 @@ func (c *controllerTest) commonTests() {
 				Expect(err).ToNot(HaveOccurred())
 
 				Expect(deploy.Annotations).To(Equal(map[string]string{
-					"app.openshift.io/connects-to": "cryostat-operator-controller-manager",
+					"app.openshift.io/connects-to": "cryostat-operator-controller",
 					"other":                        "annotation",
 				}))
 				Expect(deploy.Labels).To(Equal(map[string]string{
@@ -2563,7 +2563,7 @@ func (t *cryostatTestInput) expectMainDeployment() {
 	Expect(deployment.Name).To(Equal(t.Name))
 	Expect(deployment.Namespace).To(Equal(t.Namespace))
 	Expect(deployment.Annotations).To(Equal(map[string]string{
-		"app.openshift.io/connects-to": "cryostat-operator-controller-manager",
+		"app.openshift.io/connects-to": "cryostat-operator-controller",
 	}))
 	Expect(deployment.Labels).To(Equal(map[string]string{
 		"app":                    t.Name,
@@ -2589,7 +2589,7 @@ func (t *cryostatTestInput) expectMainDeploymentHasExtraMetadata() {
 	cr := t.getCryostatInstance()
 
 	Expect(deployment.Annotations).To(Equal(map[string]string{
-		"app.openshift.io/connects-to":      "cryostat-operator-controller-manager",
+		"app.openshift.io/connects-to":      "cryostat-operator-controller",
 		"myDeploymentExtraAnnotation":       "myDeploymentAnnotation",
 		"mySecondDeploymentExtraAnnotation": "mySecondDeploymentAnnotation",
 	}))

diff --git a/internal/test/scorecard/common_utils.go b/internal/test/scorecard/common_utils.go
@@ -41,7 +41,7 @@ import (
 )
 
 const (
-	operatorDeploymentName string        = "cryostat-operator-controller-manager"
+	operatorDeploymentName string        = "cryostat-operator-controller"
 	testTimeout            time.Duration = time.Minute * 10
 )