Merge pull request #518 from WASdev/add-operator-related-image

Added operator image to related images

Author: BradleyMayo

Makefile

@@ -190,6 +190,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 .PHONY: bundle
 bundle: manifests setup kustomize ## Generate bundle manifests and metadata, then validate generated files.
 	scripts/update-sample.sh
+	
+	sed -i.bak "s,OPERATOR_IMAGE,${IMG},g" config/manager/manager.yaml
 	sed -i.bak "s,IMAGE,${IMG},g;s,CREATEDAT,${CREATEDAT},g" config/manifests/patches/csvAnnotations.yaml
 	operator-sdk generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
@@ -202,9 +204,6 @@ bundle: manifests setup kustomize ## Generate bundle manifests and metadata, the
 	sed -i.bak "s,${IMG},${KUSTOMIZE_IMG},g;s,serviceAccountName: controller-manager,serviceAccountName: websphere-liberty-controller-manager,g" internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml
 	$(KUSTOMIZE) build config/kustomize/roles -o internal/deploy/kustomize/daily/base/websphere-liberty-roles.yaml
 
-	mv config/manifests/patches/csvAnnotations.yaml.bak config/manifests/patches/csvAnnotations.yaml
-	rm internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml.bak
-
 	$(KUSTOMIZE) build config/kubectl/crd -o internal/deploy/kubectl/websphereliberty-app-crd.yaml
 	$(KUSTOMIZE) build config/kubectl/operator -o internal/deploy/kubectl/websphereliberty-app-operator.yaml
 	$(KUSTOMIZE) build config/kubectl/rbac-watch-all -o internal/deploy/kubectl/websphereliberty-app-rbac-watch-all.yaml
@@ -213,6 +212,10 @@ bundle: manifests setup kustomize ## Generate bundle manifests and metadata, the
 	$(KUSTOMIZE) build config/kustomize/watch-all -o internal/deploy/kustomize/daily/overlays/watch-all-namespaces/cluster-roles.yaml
 	$(KUSTOMIZE) build config/kustomize/watch-another -o internal/deploy/kustomize/daily/overlays/watch-another-namespace/wlo-watched-ns/watched-roles.yaml
 
+	mv config/manager/manager.yaml.bak config/manager/manager.yaml
+	mv config/manifests/patches/csvAnnotations.yaml.bak config/manifests/patches/csvAnnotations.yaml
+	rm internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml.bak
+
 	operator-sdk bundle validate ./bundle
 
 .PHONY: fmt

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

@@ -59,7 +59,7 @@ metadata:
     capabilities: Auto Pilot
     categories: Application Runtime
     containerImage: icr.io/cpopen/websphere-liberty-operator:daily
-    createdAt: "2023-06-26T17:52:19Z"
+    createdAt: "2023-07-20T10:35:34Z"
     description: Deploy and manage containerized Liberty applications
     olm.skipRange: '>=1.0.0 <1.2.1'
     operators.openshift.io/infrastructure-features: '["disconnected"]'
@@ -860,6 +860,8 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
                   value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:d3c67c4a15c97b0fb82f9ef4a2ccf474232b878787e9eea39af75a3ac78469e3
+                - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
+                  value: icr.io/cpopen/websphere-liberty-operator:daily
                 image: icr.io/cpopen/websphere-liberty-operator:daily
                 livenessProbe:
                   failureThreshold: 3
@@ -1134,4 +1136,6 @@ spec:
   relatedImages:
   - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:d3c67c4a15c97b0fb82f9ef4a2ccf474232b878787e9eea39af75a3ac78469e3
     name: liberty-sample-app
+  - image: icr.io/cpopen/websphere-liberty-operator:daily
+    name: websphere-liberty-operator
   version: 1.2.1

config/manager/manager.yaml

@@ -73,6 +73,8 @@ spec:
                 fieldPath: metadata.annotations['olm.targetNamespaces']
           - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
             value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:d3c67c4a15c97b0fb82f9ef4a2ccf474232b878787e9eea39af75a3ac78469e3
+          - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
+            value: OPERATOR_IMAGE
         securityContext:
           allowPrivilegeEscalation: false
           privileged: false

internal/deploy/kubectl/websphereliberty-app-operator.yaml

@@ -306,6 +306,8 @@ spec:
           value: WEBSPHERE_LIBERTY_WATCH_NAMESPACE
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
           value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:d3c67c4a15c97b0fb82f9ef4a2ccf474232b878787e9eea39af75a3ac78469e3
+        - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
+          value: icr.io/cpopen/websphere-liberty-operator:daily
         image: icr.io/cpopen/websphere-liberty-operator:daily
         livenessProbe:
           failureThreshold: 3

internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml

@@ -56,6 +56,8 @@ spec:
               fieldPath: metadata.namespace
         - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
           value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:d3c67c4a15c97b0fb82f9ef4a2ccf474232b878787e9eea39af75a3ac78469e3
+        - name: RELATED_IMAGE_WEBSPHERE_LIBERTY_OPERATOR
+          value: cp.stg.icr.io/cp/websphere-liberty-operator:main
         image: cp.stg.icr.io/cp/websphere-liberty-operator:main
         livenessProbe:
           failureThreshold: 3