bundle: add init container for console to wait for reconciliation

Signed-off-by: Leela Venkaiah G <[email protected]>
red-hat-storage · Jul 29, 2024 · fccd17f · fccd17f
1 parent b2bf377
commit fccd17f
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -99,9 +99,11 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 	$(KUSTOMIZE) build config/crd | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} && \
+		$(KUSTOMIZE) edit set image reconcile-waiter=$(IMG)
 	cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(RBAC_PROXY_IMG)
-	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG)
+	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG) && \
+		$(KUSTOMIZE) edit set image reconcile-waiter=$(IMG)
 	$(KUSTOMIZE) build config/default | sed "s|STATUS_REPORTER_IMAGE_VALUE|$(IMG)|g" | awk '{print}' | kubectl apply -f -
 
 remove: ## Remove controller from the K8s cluster specified in ~/.kube/config.
@@ -121,6 +123,7 @@ bundle: manifests kustomize operator-sdk yq ## Generate bundle manifests and met
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) && \
 		$(KUSTOMIZE) edit set image reconcile-waiter=$(IMG)
 	cd config/console && $(KUSTOMIZE) edit set image ocs-client-operator-console=$(OCS_CLIENT_CONSOLE_IMG) && \
+		$(KUSTOMIZE) edit set image reconcile-waiter=$(IMG) && \
 		$(KUSTOMIZE) edit set nameprefix $(OPERATOR_NAMEPREFIX)
 	cd config/default && \
 		$(KUSTOMIZE) edit set image kube-rbac-proxy=$(RBAC_PROXY_IMG) && \

diff --git a/...nifests/ocs-client-operator-console-init-rb_rbac.authorization.k8s.io_v1_rolebinding.yaml b/...nifests/ocs-client-operator-console-init-rb_rbac.authorization.k8s.io_v1_rolebinding.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  creationTimestamp: null
+  name: ocs-client-operator-console-init-rb
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ocs-client-operator-consoler-init-role
+subjects:
+- kind: ServiceAccount
+  name: ocs-client-operator-console-init-sa
+  namespace: system
diff --git a/...le/manifests/ocs-client-operator-console-init-role_rbac.authorization.k8s.io_v1_role.yaml b/...le/manifests/ocs-client-operator-console-init-role_rbac.authorization.k8s.io_v1_role.yaml
@@ -0,0 +1,20 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  name: ocs-client-operator-console-init-role
+rules:
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ocs.openshift.io
+  resources:
+  - storageclusters
+  verbs:
+  - get
+  - list
diff --git a/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml b/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
@@ -7,7 +7,7 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-client-console"]'
     containerImage: quay.io/ocs-dev/ocs-client-operator:latest
-    createdAt: "2024-07-29T14:03:35Z"
+    createdAt: "2024-07-29T14:43:47Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -830,8 +830,20 @@ spec:
                   name: ocs-client-operator-console-nginx-log
                 - mountPath: /var/lib/nginx/tmp
                   name: ocs-client-operator-console-nginx-tmp
+              initContainers:
+              - command:
+                - /reconcile-waiter
+                env:
+                - name: OPERATOR_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                image: quay.io/ocs-dev/ocs-client-operator:latest
+                name: reconcile-waiter
+                resources: {}
               securityContext:
                 runAsNonRoot: true
+              serviceAccountName: ocs-client-operator-console-init-sa
               volumes:
               - name: ocs-client-operator-console-serving-cert
                 secret:

diff --git a/config/console/console_init.yaml b/config/console/console_init.yaml
@@ -11,6 +11,17 @@ spec:
       labels:
         app.kubernetes.io/name: ocs-client-operator-console
     spec:
+      initContainers:
+      - name: reconcile-waiter
+        image: reconcile-waiter:latest
+        command:
+          - /reconcile-waiter
+        env:
+        - name: OPERATOR_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+      serviceAccountName: ocs-client-operator-console-init-sa
       containers:
         - name: ocs-client-operator-console
           image: ocs-client-operator-console:latest

diff --git a/config/console/kustomization.yaml b/config/console/kustomization.yaml
@@ -12,4 +12,7 @@ images:
 - name: ocs-client-operator-console
   newName: quay.io/ocs-dev/ocs-client-console
   newTag: latest
+- name: reconcile-waiter
+  newName: quay.io/ocs-dev/ocs-client-operator
+  newTag: latest
 namePrefix: ocs-client-operator-
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -31,7 +31,7 @@ spec:
         runAsNonRoot: true
       initContainers:
       - name: reconcile-waiter
-        image: controller:latest
+        image: reconcile-waiter:latest
         command:
           - /reconcile-waiter
         env:

diff --git a/config/rbac/console_init_role.yaml b/config/rbac/console_init_role.yaml
@@ -0,0 +1,19 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: console-init-role
+rules:
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ocs.openshift.io
+  resources:
+  - storageclusters
+  verbs:
+  - get
+  - list
diff --git a/config/rbac/console_init_role_binding.yaml b/config/rbac/console_init_role_binding.yaml
@@ -0,0 +1,12 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: console-init-rb
+subjects:
+  - kind: ServiceAccount
+    name: ocs-client-operator-console-init-sa
+    namespace: system
+roleRef:
+  kind: Role
+  name: ocs-client-operator-consoler-init-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/config/rbac/console_init_service_account.yaml b/config/rbac/console_init_service_account.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: reconcile-waiter
+  namespace: system
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
@@ -42,3 +42,6 @@ resources:
 - csi_rbd_provisioner_role.yaml
 - csi_rbd_provisioner_role_binding.yaml
 - csi_rbd_provisioner_service_account.yaml
+- console_init_role.yaml
+- console_init_role_binding.yaml
+- console_init_service_account.yaml