chore: Parameterize IAF instances

IBM · Nov 5, 2021 · bb988da · bb988da
1 parent 0186941
commit bb988da
Show file tree

Hide file tree

Showing 67 changed files with 438 additions and 680 deletions.
diff --git a/config/argocd-cloudpaks/cp-shared/Chart.yaml b/config/argocd-cloudpaks/cp-shared/Chart.yaml
@@ -16,7 +16,7 @@ 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.2.0
+version: 0.3.0
 
 # 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

diff --git a/config/argocd-cloudpaks/cp-shared/templates/00-presync-common-config-map.yaml b/config/argocd-cloudpaks/cp-shared/templates/00-presync-common-config-map.yaml
@@ -12,6 +12,7 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"

diff --git a/config/argocd-cloudpaks/cp-shared/templates/00-presync-cp4a-config-map.yaml b/config/argocd-cloudpaks/cp-shared/templates/00-presync-cp4a-config-map.yaml
@@ -12,6 +12,7 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"

diff --git a/config/argocd-cloudpaks/cp-shared/templates/cp-shared-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/cp-shared-app.yaml
@@ -9,12 +9,13 @@ metadata:
     argocd.argoproj.io/sync-wave: "100"
 spec:
   destination:
-    namespace: ibm-cloudpaks
+    namespace: {{.Values.argocd_app_namespace}}
     server: https://kubernetes.default.svc
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
   project: default

diff --git a/config/argocd-cloudpaks/cp-shared/templates/cp-shared-operators-app.yaml b/config/argocd-cloudpaks/cp-shared/templates/cp-shared-operators-app.yaml
@@ -9,12 +9,13 @@ metadata:
     argocd.argoproj.io/sync-wave: "100"
 spec:
   destination:
-    namespace: ibm-cloudpaks
+    namespace: {{.Values.argocd_app_namespace}}
     server: https://kubernetes.default.svc
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
   project: default

diff --git a/config/argocd-cloudpaks/cp4a/Chart.yaml b/config/argocd-cloudpaks/cp4a/Chart.yaml
@@ -16,7 +16,7 @@ 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.2.0
+version: 0.3.0
 
 # 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

diff --git a/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-cluster-route.yaml b/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-cluster-route.yaml
@@ -12,13 +12,14 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"
               cpu: "250m"
             limits:
-              memory: "128Mi"
-              cpu: "500m"
+              memory: "96Mi"
+              cpu: "300m"
           env:
             - name: ARGOCD_APP_NAME
               value: cp4a-app

diff --git a/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-ocp-platform.yaml b/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-ocp-platform.yaml
@@ -12,13 +12,14 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"
               cpu: "250m"
             limits:
               memory: "128Mi"
-              cpu: "500m"
+              cpu: "300m"
           env:
             - name: ARGOCD_APP_NAME
               value: cp4a-app

diff --git a/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-storage-classes.yaml b/config/argocd-cloudpaks/cp4a/templates/00-presync-adjust-storage-classes.yaml
@@ -12,13 +12,14 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"
               cpu: "250m"
             limits:
-              memory: "128Mi"
-              cpu: "500m"
+              memory: "96Mi"
+              cpu: "300m"
           env:
             - name: ARGOCD_APP_NAME
               value: cp4a-app

diff --git a/config/argocd-cloudpaks/cp4a/templates/cp4a-app.yaml b/config/argocd-cloudpaks/cp4a/templates/cp4a-app.yaml
@@ -15,6 +15,7 @@ spec:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
   project: default

diff --git a/config/argocd-cloudpaks/cp4a/templates/cp4a-operator-app.yaml b/config/argocd-cloudpaks/cp4a/templates/cp4a-operator-app.yaml
@@ -14,8 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
-        - /status
         - /spec/source/repoURL
+        - /spec/source/targetRevision
+        - /status
       kind: Application
   project: default
   source:

diff --git a/config/argocd-cloudpaks/cp4a/templates/cp4a-resources-app.yaml b/config/argocd-cloudpaks/cp4a/templates/cp4a-resources-app.yaml
@@ -14,8 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
-        - /status
         - /spec/source/repoURL
+        - /spec/source/targetRevision
+        - /status
       kind: Application
     - group: icp4a.ibm.com
       jsonPointers:

diff --git a/config/argocd-cloudpaks/cp4aiops/Chart.yaml b/config/argocd-cloudpaks/cp4aiops/Chart.yaml
@@ -16,7 +16,7 @@ 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.2.0
+version: 0.3.0
 
 # 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

diff --git a/config/argocd-cloudpaks/cp4aiops/templates/00-presync-adjust-storage-classes.yaml b/config/argocd-cloudpaks/cp4aiops/templates/00-presync-adjust-storage-classes.yaml
diff --git a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-app.yaml
@@ -14,7 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
+        - /spec/source/helm/parameters
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
   project: default
@@ -25,6 +27,10 @@ spec:
           value: ${ARGOCD_APP_NAME}
         - name: argocd_app_namespace
           value: ${ARGOCD_APP_NAMESPACE}
+        - name: automation_base_instance_name
+          value: "{{.Values.automation_base_instance_name}}"
+        - name: automation_ui_config_instance_name
+          value: "{{.Values.automation_ui_config_instance_name}}"
         - name: metadata.argocd_app_namespace
           value: {{.Values.metadata.argocd_app_namespace}}
         - name: repoURL

diff --git a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-operator-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-operator-app.yaml
@@ -15,8 +15,13 @@ spec:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
+    - group: v1
+      jsonPointers:
+        - /metadata/labels
+      kind: Namespace
   project: default
   source:
     helm:

diff --git a/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-resources-app.yaml b/config/argocd-cloudpaks/cp4aiops/templates/cp4aiops-resources-app.yaml
@@ -15,6 +15,7 @@ spec:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
   project: default
@@ -25,6 +26,10 @@ spec:
           value: ${ARGOCD_APP_NAME}
         - name: argocd_app_namespace
           value: ${ARGOCD_APP_NAMESPACE}
+        - name: automation_base_instance_name
+          value: "{{.Values.automation_base_instance_name}}"
+        - name: automation_ui_config_instance_name
+          value: "{{.Values.automation_ui_config_instance_name}}"
         - name: metadata.argocd_app_namespace
           value: {{.Values.metadata.argocd_app_namespace}}
         - name: repoURL

diff --git a/config/argocd-cloudpaks/cp4aiops/values.yaml b/config/argocd-cloudpaks/cp4aiops/values.yaml
@@ -1,6 +1,8 @@
 ---
 repoURL: https://github.com/IBM/cloudpak-gitops
 targetRevision: main
+automation_base_instance_name: ""
+automation_ui_config_instance_name: ""
 serviceaccount:
   argocd_application_controller: openshift-gitops-argocd-application-controller
 metadata:

diff --git a/config/argocd-cloudpaks/cp4i/Chart.yaml b/config/argocd-cloudpaks/cp4i/Chart.yaml
@@ -16,7 +16,7 @@ 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.2.0
+version: 0.3.0
 
 # 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

diff --git a/config/argocd-cloudpaks/cp4i/templates/00-presync-adjust-storage-classes.yaml b/config/argocd-cloudpaks/cp4i/templates/00-presync-adjust-storage-classes.yaml
@@ -12,6 +12,7 @@ spec:
       containers:
         - name: config
           image: quay.io/openshift/origin-cli:latest
+          imagePullPolicy: IfNotPresent
           resources:
             requests:
               memory: "64Mi"

diff --git a/config/argocd-cloudpaks/cp4i/templates/cp4i-app.yaml b/config/argocd-cloudpaks/cp4i/templates/cp4i-app.yaml
@@ -15,6 +15,7 @@ spec:
     - group: argoproj.io
       jsonPointers:
         - /spec/source/repoURL
+        - /spec/source/targetRevision
         - /status
       kind: Application
     - group: route.openshift.io

diff --git a/config/argocd-cloudpaks/cp4i/templates/cp4i-client-app.yaml b/config/argocd-cloudpaks/cp4i/templates/cp4i-client-app.yaml
@@ -14,8 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
-        - /status
         - /spec/source/repoURL
+        - /spec/source/targetRevision
+        - /status
       kind: Application
   project: default
   source:

diff --git a/config/argocd-cloudpaks/cp4i/templates/cp4i-operator-app.yaml b/config/argocd-cloudpaks/cp4i/templates/cp4i-operator-app.yaml
@@ -14,8 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
-        - /status
         - /spec/source/repoURL
+        - /spec/source/targetRevision
+        - /status
       kind: Application
   project: default
   source:

diff --git a/config/argocd-cloudpaks/cp4i/templates/cp4i-resources-app.yaml b/config/argocd-cloudpaks/cp4i/templates/cp4i-resources-app.yaml
@@ -14,8 +14,9 @@ spec:
   ignoreDifferences:
     - group: argoproj.io
       jsonPointers:
-        - /status
         - /spec/source/repoURL
+        - /spec/source/targetRevision
+        - /status
       kind: Application
     - group: datapower.ibm.com
       jsonPointers:

diff --git a/config/argocd-rhacm/templates/rhacm-cloudpaks-app.yaml b/config/argocd-rhacm/templates/rhacm-cloudpaks-app.yaml
@@ -17,6 +17,11 @@ spec:
         - /spec/syncPolicy
         - /status
       kind: Application
+    - group: v1
+      # Due to serverless prereqs modifying annotations
+      jsonPointers:
+        - /metadata/annotations
+      kind: Namespace
   project: default
   source:
     helm:

diff --git a/config/argocd/Chart.yaml b/config/argocd/Chart.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: v2
-name: argo-app
+name: argocd
 description: Argo application
 
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/config/cicd/base/01-namespaces/cicd-environment.yaml b/config/cicd/base/01-namespaces/cicd-environment.yaml
@@ -4,7 +4,6 @@ kind: Namespace
 metadata:
   annotations:
     app.openshift.io/vcs-uri: https://github.com/IBM/cloudpak-gitops.git?ref=main
-    argocd.argoproj.io/sync-wave: "0"
   creationTimestamp: null
   name: cicd
 spec: {}