fix: Wait for entitlement key

config/cloudpaks/cp4i/install-prereqs/values.yaml

@@ -4,6 +4,7 @@ serviceaccount:
   ibm_cloudpaks_installer: ibm-cp4i-installer
 metadata:
   argocd_namespace: openshift-gitops
+  argocd_app_namespace: ibm-cloudpaks
 storageclass:
   rwo: ocs-storagecluster-ceph-rbd
   rwx: ocs-storagecluster-cephfs

config/rhacm/cloudpaks/Chart.yaml

@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.1
+version: 0.3.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "0.5.1"
+appVersion: 0.8.4

config/rhacm/cloudpaks/templates/policy-cp-shared.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp-shared-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: "{{.Values.metadata.argocd_app_namespace}}"

config/rhacm/cloudpaks/templates/policy-cp4a.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp4a-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: '{{ "{{ fromClusterClaim \"cp4a\" }}" }}'

config/rhacm/cloudpaks/templates/policy-cp4aiops.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp4aiops-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: '{{ "{{ fromClusterClaim \"cp4aiops\" }}" }}'

config/rhacm/cloudpaks/templates/policy-cp4d.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp4d-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: '{{ "{{ fromClusterClaim \"cp4d\" }}" }}'

config/rhacm/cloudpaks/templates/policy-cp4i.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp4i-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: '{{ "{{ fromClusterClaim \"cp4i\" }}" }}'

config/rhacm/cloudpaks/templates/policy-cp4s.yaml

@@ -35,7 +35,9 @@ spec:
                 kind: Application
                 metadata:
                   name: cp4s-app
-                  namespace: openshift-gitops
+                  # Look up used to delay the application of the policy
+                  # until this secret is created
+                  namespace: '{{ "{{ (lookup \"v1\" \"Secret\" \"openshift-gitops\" \"ibm-entitlement-key\").metadata.namespace }}" }}'
                 spec:
                   destination:
                     namespace: '{{ "{{ fromClusterClaim \"cp4s\" }}" }}'

tests/prebuild/lint.sh

@@ -73,7 +73,11 @@ log "INFO: Completed yamllint run: ${yl_result}"
 
 log "INFO: Starting helm lint run"
 hl_result=0
-find . -name Chart.yaml | sed "s|/Chart.yaml||g" | xargs helm lint || hl_result=1
+find . -name Chart.yaml \
+    | grep -v /config/rhacm/cloudpaks \
+    | sed "s|/Chart.yaml||g" \
+    | xargs helm lint \
+|| hl_result=1
 log "INFO: Completed helm lint run: ${hl_result}"
 
 log "INFO: Starting helm template run"
@@ -85,7 +89,9 @@ do
     if [ ${htl} -eq 1 ]; then
         ht_result=1;
     fi
-done <<< "$(find . -name Chart.yaml | sed "s|/Chart.yaml||g")"
+done <<< "$(find . -name Chart.yaml \
+    | grep -v /config/rhacm/cloudpaks \
+    | sed "s|/Chart.yaml||g")"
 log "INFO: Completed helm template run: ${ht_result}"
 
 result=$((sc_result+yl_result+hl_result+ht_result))