Create initContainer to wait for clustermanagementaddons

Signed-off-by: francostellari <[email protected]> rebase
kubestellar · Apr 9, 2024 · 97d4d91 · 97d4d91
1 parent 73d8e3a
commit 97d4d91
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 29 deletions.
diff --git a/chart/templates/operator.yaml b/chart/templates/operator.yaml
@@ -215,6 +215,33 @@ spec:
       labels:
         app: status-controller
     spec:
+      initContainers:
+      - name: create-crd
+        image: quay.io/kubestellar/kubectl:1.29.3
+        command: ['sh', '-c']
+        args:
+        - |
+          echo -n "Waiting for managedclusteraddons CRD"
+          while [ "$(kubectl get crd clustermanagementaddons.addon.open-cluster-management.io 2> /dev/null)" == "" ] ; do
+            echo -n "."
+            sleep 1
+          done
+          echo -e "\033[0;32m\xE2\x9C\x94\033[0m"
+          echo "Creating addon-status CR:"
+          kubectl apply -f - <<EOF
+          apiVersion: addon.open-cluster-management.io/v1alpha1
+          kind: ClusterManagementAddOn
+          metadata:
+            name: addon-status
+            namespace: open-cluster-management
+          spec:
+            addOnMeta:
+              description: status addon provides full status on applied resources
+              displayName: addon-status
+            supportedConfigs:
+            - group: addon.open-cluster-management.io
+              resource: addondeploymentconfigs
+          EOF
       containers:
       - args:
         - controller
@@ -239,16 +266,3 @@ spec:
       securityContext:
         runAsNonRoot: true
       serviceAccountName: addon-status-sa
----
-apiVersion: addon.open-cluster-management.io/v1alpha1
-kind: ClusterManagementAddOn
-metadata:
-  name: addon-status
-  namespace: open-cluster-management
-spec:
-  addOnMeta:
-    description: status addon provides full status on applied resources
-    displayName: addon-status
-  supportedConfigs:
-  - group: addon.open-cluster-management.io
-    resource: addondeploymentconfigs
diff --git a/config/manager/clustermanagementaddon.yaml b/config/manager/clustermanagementaddon.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,13 +1,12 @@
 resources:
 - manager.yaml
-- clustermanagementaddon.yaml
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
   newName: ko.local/ocm-status-addon
-  newTag: to_be_replaced
+  newTag: ce5c42d
 
 replacements:
 - source:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -24,6 +24,33 @@ spec:
       securityContext:
         runAsNonRoot: true
       serviceAccountName: status-sa
+      initContainers:
+      - name: create-crd
+        image: quay.io/kubestellar/kubectl:1.29.3
+        command: ['sh', '-c']
+        args:
+        - |
+          echo -n "Waiting for managedclusteraddons CRD"
+          while [ "$(kubectl get crd clustermanagementaddons.addon.open-cluster-management.io 2> /dev/null)" == "" ] ; do
+            echo -n "."
+            sleep 1
+          done
+          echo -e "\033[0;32m\xE2\x9C\x94\033[0m"
+          echo "Creating addon-status CR:"
+          kubectl apply -f - <<EOF
+          apiVersion: addon.open-cluster-management.io/v1alpha1
+          kind: ClusterManagementAddOn
+          metadata:
+            name: addon-status
+            namespace: open-cluster-management
+          spec:
+            addOnMeta:
+              description: status addon provides full status on applied resources
+              displayName: addon-status
+            supportedConfigs:
+            - group: addon.open-cluster-management.io
+              resource: addondeploymentconfigs
+          EOF
       containers:
       - name: status-controller
         image: controller
@@ -39,7 +66,7 @@ spec:
             memory: 512Mi
           requests:
             cpu: 10m
-            memory: 64Mi      
+            memory: 64Mi
         env:
         - name: STATUS_ADDDON_IMAGE_NAME
           value: STATUS_ADDDON_IMAGE_NAME_PLACEHOLDER

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: manager-role
+  name: addon-manager-role
 rules:
 - apiGroups:
   - ""
@@ -31,8 +30,11 @@ rules:
   resources:
   - clustermanagementaddons
   verbs:
+  - create
   - get
   - list
+  - patch
+  - update
   - watch
 - apiGroups:
   - addon.open-cluster-management.io
@@ -158,3 +160,9 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get