chore: Use multi-arch images for CP4D

Signed-off-by: Denilson Nastacio <[email protected]>
IBM · Jan 31, 2024 · 7a4e4fd · 7a4e4fd
1 parent ad1a0c8
commit 7a4e4fd
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 29 deletions.
diff --git a/config/argocd-cloudpaks/cp4d/Chart.yaml b/config/argocd-cloudpaks/cp4d/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.8.1
+version: 0.8.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

diff --git a/config/argocd-cloudpaks/cp4d/templates/0000-presync-adjust-storage-classes.yaml b/config/argocd-cloudpaks/cp4d/templates/0000-presync-adjust-storage-classes.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
         - name: config
-          image: quay.io/openshift/origin-cli:latest
+          image: registry.redhat.io/openshift4/ose-cli:latest
           imagePullPolicy: IfNotPresent
           env:
             - name: ARGOCD_APP_NAME
@@ -37,21 +37,39 @@ spec:
 
               echo "INFO: Install Argo CLI."
               # Install it from cluster, not from Internet, so airgap scenarios still work
-              argo_route=openshift-gitops-server
-              argo_secret=openshift-gitops-cluster
+              argo_route="${ARGOCD_NAMESPACE}-server"
+              argo_secret="${ARGOCD_NAMESPACE}-cluster"
 
               export HOME=/tmp
               argo_cmd="${HOME}/argocd"
               result=0
 
+              linux_arch=$(uname -p)
+              argocd_cli_arch=amd64
+              cpd_cli_arch=""
+              if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
+                  argocd_cli_arch=${linux_arch}
+                  cpd_cli_arch=".${linux_arch}"
+              fi
+
               argo_url=$(oc get route ${argo_route} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.spec.host}') \
-              && curl -skL "${argo_url}/download/argocd-linux-amd64" -o "${argo_cmd}" \
-              && chmod 755 "${argo_cmd}" \
+              && cli_status=$(curl -skL "${argo_url}/download/argocd-linux-${argocd_cli_arch}" \
+                  -o "${argo_cmd}" \
+                  -w "%{http_code}") \
+              || result=1
+
+              if [ "${cli_status}" != "200" ]; then
+                  echo "ERROR: Unable to download argocd client."
+                  exit 2
+              fi
+
+              chmod 755 "${argo_cmd}" \
               && argo_pwd=$(oc get secret ${argo_secret} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.data.admin\.password}' | base64 -d ; echo ) \
               && "${argo_cmd}" login "${argo_url}" --username admin --password "${argo_pwd}" --insecure \
               && "${argo_cmd}" app set "${ARGOCD_APP_NAME}" \
                   --helm-set-string storageclass.rwo="${storage_class_rwo}" \
                   --helm-set-string storageclass.rwx="${storage_class_rwx}" \
+                  --helm-set-string image_arch="${cpd_cli_arch}" \
               && echo "INFO: ${ARGOCD_APP_NAME} successfully updated storage classes." \
               || result=1
 

diff --git a/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml b/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml
@@ -26,10 +26,10 @@ spec:
           value: {{.Values.components}}
         - name: iam_integration
           value: "{{.Values.iam_integration}}"
+        - name: image_arch
+          value: {{.Values.image_arch}}
         - name: metadata.argocd_app_namespace
           value: {{.Values.metadata.argocd_app_namespace}}
-        - name: metadata.image_arch
-          value: {{.Values.metadata.image_arch}}
         - name: metadata.operators_namespace
           value: {{.Values.metadata.operators_namespace}}
         - name: metadata.operands_namespace

diff --git a/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml b/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml
@@ -22,10 +22,10 @@ spec:
           value: {{.Values.components}}
         - name: iam_integration
           value: "{{.Values.iam_integration}}"
+        - name: image_arch
+          value: {{.Values.image_arch}}
         - name: metadata.argocd_app_namespace
           value: {{.Values.metadata.argocd_app_namespace}}
-        - name: metadata.image_arch
-          value: {{.Values.metadata.image_arch}}
         - name: metadata.operators_namespace
           value: {{.Values.metadata.operators_namespace}}
         - name: metadata.operands_namespace

diff --git a/config/argocd-cloudpaks/cp4d/values.yaml b/config/argocd-cloudpaks/cp4d/values.yaml
@@ -18,6 +18,9 @@ storageclass:
 
 iam_integration: true
 
-image_arch: amd64
+# for the olm-v2 utils image
+image_arch: ""
+#image_arch: .s390x
+#image_arch: .ppc64le
 
 version: 4.8.0
diff --git a/config/argocd-cloudpaks/cp4s/templates/00-presync-adjust-parameters.yaml b/config/argocd-cloudpaks/cp4s/templates/00-presync-adjust-parameters.yaml
@@ -13,13 +13,6 @@ spec:
         - name: config
           image: registry.redhat.io/openshift4/ose-cli:latest
           imagePullPolicy: IfNotPresent
-          resources:
-            requests:
-              memory: "64Mi"
-              cpu: "150m"
-            limits:
-              memory: "128Mi"
-              cpu: "200m"
           env:
             - name: ARGOCD_NAMESPACE
               value: {{.Values.metadata.argocd_namespace}}
@@ -60,9 +53,24 @@ spec:
               argo_cmd="${HOME}/argocd"
               result=0
 
+              linux_arch=$(uname -p)
+              argocd_cli_arch=amd64
+              if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
+                  argocd_cli_arch=${linux_arch}
+              fi
+
               argo_url=$(oc get route ${argo_route} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.spec.host}') \
-              && curl -skL "${argo_url}/download/argocd-linux-amd64" -o "${argo_cmd}" \
-              && chmod 755 "${argo_cmd}" \
+              && cli_status=$(curl -skL "${argo_url}/download/argocd-linux-${argocd_cli_arch}" \
+                  -o "${argo_cmd}" \
+                  -w "%{http_code}") \
+              || result=1
+
+              if [ "${cli_status}" != "200" ]; then
+                  echo "ERROR: Unable to download argocd client."
+                  exit 2
+              fi
+
+              chmod 755 "${argo_cmd}" \
               && argo_pwd=$(oc get secret ${argo_secret} -n ${ARGOCD_NAMESPACE} -ojsonpath='{.data.admin\.password}' | base64 -d ; echo ) \
               && "${argo_cmd}" login "${argo_url}" --username admin --password "${argo_pwd}" --insecure \
               || result=1

diff --git a/config/cloudpaks/cp4d/Chart.yaml b/config/cloudpaks/cp4d/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.8.1
+version: 0.8.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

diff --git a/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml b/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: configure-cluster
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           env:
             - name: PROJECT_CERT_MANAGER
               value: ibm-cert-manager
@@ -25,8 +25,6 @@ spec:
               value: {{.Values.version}}
             - name: COMPONENTS
               value: {{.Values.components}}
-            - name: IMAGE_ARCH
-              value: {{.Values.image_arch}}
           command:
             - /bin/bash
             - -c

diff --git a/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml b/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: install-olm
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           env:
             - name: PROJECT_CPD_INST_OPERATORS
               value: {{.Values.metadata.operators_namespace}}
@@ -45,6 +45,12 @@ spec:
                   exit 1
               }
 
+              # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=requirements-hardware#hardware-reqs__svc-power
+              linux_arch=$(uname -p)
+              if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
+                  COMPONENTS=${COMPONENTS/,rstudio/}
+              fi
+
               # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=services-creating-informix-scc
               echo "INFO: Creating custom security context constraints for services."
               if [[ ${COMPONENTS} =~ informix ]]; then

diff --git a/config/cloudpaks/cp4d/templates/0100-sync-install-platform.yaml b/config/cloudpaks/cp4d/templates/0100-sync-install-platform.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: install-components
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           env:
             - name: PROJECT_CPD_INST_OPERANDS
               value: {{.Values.metadata.operands_namespace}}
@@ -35,6 +35,12 @@ spec:
 
               result=0
 
+              # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=requirements-hardware#hardware-reqs__svc-power
+              linux_arch=$(uname -p)
+              if [ "${linux_arch}" == "ppc64le" ] || [ "${linux_arch}" == "s390x" ]; then
+                  COMPONENTS=${COMPONENTS/,rstudio/}
+              fi
+
               # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=data-installing-cloud-pak
               echo "INFO: Installing components in a specialized installation." \
               && bin/apply-cr \

diff --git a/config/cloudpaks/cp4d/templates/0100-sync-install-zen-workaround.yaml b/config/cloudpaks/cp4d/templates/0100-sync-install-zen-workaround.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: patch-zen-database
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           env:
             - name: COMPONENTS
               value: {{.Values.components}}

diff --git a/config/cloudpaks/cp4d/templates/0401-postsync-certificates.yaml b/config/cloudpaks/cp4d/templates/0401-postsync-certificates.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: config
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           imagePullPolicy: IfNotPresent
           env:
             - name: PROJECT_CPD_INST_OPERANDS

diff --git a/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml b/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: install-olm
-          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}"
+          image: "icr.io/cpopen/cpd/olm-utils-v2:{{.Values.version}}{{.Values.image_arch}}"
           env:
             - name: PROJECT_CPD_INST_OPERANDS
               value: {{.Values.metadata.operands_namespace}}