diff --git a/README.md b/README.md index b73c1c68..4a708c2d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Supported versions: | Cloud Pak | Version | Installation mode | | ----------|---------|-------------------| | Cloud Pak for Business Automation | [22.0.2](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/22.0.2) | Multi-pattern starter deployment | -| Cloud Pak for Data | [4.6.6](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=overview) | Online, specialized installation | +| Cloud Pak for Data | [4.7.1](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=overview) | Online, specialized installation | | Cloud Pak for Integration | [2023.2](https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.2) | Online installation | | Cloud Pak for Security | [1.10.12](https://www.ibm.com/docs/en/cloud-paks/cp-security/1.10) | Online installation | | Cloud Pak for Watson AIOps | [4.1.0](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.1.0) | Online Installation | diff --git a/config/argocd-cloudpaks/cp4d/Chart.yaml b/config/argocd-cloudpaks/cp4d/Chart.yaml index ff8684ff..42ba584f 100644 --- a/config/argocd-cloudpaks/cp4d/Chart.yaml +++ b/config/argocd-cloudpaks/cp4d/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.7.0 +version: 0.8.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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "1.4.2" +appVersion: "1.5.1" diff --git a/config/argocd-cloudpaks/cp4d/templates/0000-app-namespace.yaml b/config/argocd-cloudpaks/cp4d/templates/0000-app-namespace.yaml index 9a987847..90ffc41a 100644 --- a/config/argocd-cloudpaks/cp4d/templates/0000-app-namespace.yaml +++ b/config/argocd-cloudpaks/cp4d/templates/0000-app-namespace.yaml @@ -1,10 +1,10 @@ -{{ if not ( eq ( default "" .Values.metadata.argocd_app_namespace ) "ibm-cloudpaks" ) }} +{{ if not ( eq ( default "" .Values.metadata.operators_namespace ) "ibm-cloudpaks" ) }} --- apiVersion: v1 kind: Namespace metadata: creationTimestamp: null - name: {{.Values.metadata.argocd_app_namespace}} + name: {{.Values.metadata.operators_namespace}} spec: {} status: {} {{ end }} diff --git a/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml b/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml index 2338714a..2d420908 100644 --- a/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml +++ b/config/argocd-cloudpaks/cp4d/templates/0100-cp4d-app.yaml @@ -1,5 +1,4 @@ --- -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -29,10 +28,12 @@ spec: value: "{{.Values.iam_integration}}" - name: metadata.argocd_app_namespace value: {{.Values.metadata.argocd_app_namespace}} - - name: metadata.common_services_namespace - value: {{.Values.metadata.common_services_namespace}} + - name: metadata.image_arch + value: {{.Values.metadata.image_arch}} - name: metadata.operators_namespace value: {{.Values.metadata.operators_namespace}} + - name: metadata.operands_namespace + value: {{.Values.metadata.operands_namespace}} - name: repoURL value: ${ARGOCD_APP_SOURCE_REPO_URL} - name: serviceaccount.argocd_application_controller diff --git a/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml b/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml index 987ab0db..a001c38f 100644 --- a/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml +++ b/config/argocd-cloudpaks/cp4d/templates/0200-cp4d-platform-app.yaml @@ -24,10 +24,12 @@ spec: value: "{{.Values.iam_integration}}" - name: metadata.argocd_app_namespace value: {{.Values.metadata.argocd_app_namespace}} - - name: metadata.common_services_namespace - value: {{.Values.metadata.common_services_namespace}} + - name: metadata.image_arch + value: {{.Values.metadata.image_arch}} - name: metadata.operators_namespace value: {{.Values.metadata.operators_namespace}} + - name: metadata.operands_namespace + value: {{.Values.metadata.operands_namespace}} - name: repoURL value: ${ARGOCD_APP_SOURCE_REPO_URL} - name: serviceaccount.argocd_application_controller diff --git a/config/argocd-cloudpaks/cp4d/values.yaml b/config/argocd-cloudpaks/cp4d/values.yaml index 59916b73..5e50d93c 100644 --- a/config/argocd-cloudpaks/cp4d/values.yaml +++ b/config/argocd-cloudpaks/cp4d/values.yaml @@ -6,11 +6,11 @@ serviceaccount: metadata: argocd_app_namespace: cp4d argocd_namespace: openshift-gitops - common_services_namespace: cp4d operators_namespace: cp4d + operands_namespace: cp4d-operands -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=information-determining-which-components-install -components: cpfs,scheduler,cpd_platform,rstudio,wml,ws +# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install +components: ibm-cert-manager,ibm-licensing,cpfs,cpd_platform,rstudio,wml,ws storageclass: rwo: ocs-storagecluster-ceph-rbd @@ -18,4 +18,6 @@ storageclass: iam_integration: true -version: 4.6.6 +image_arch: amd64 + +version: 4.7.1 diff --git a/config/cloudpaks/cp4d/Chart.yaml b/config/cloudpaks/cp4d/Chart.yaml index 0429bcf9..883a67bd 100644 --- a/config/cloudpaks/cp4d/Chart.yaml +++ b/config/cloudpaks/cp4d/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.6.0 +version: 0.7.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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.6.6 +appVersion: 4.7.1 diff --git a/config/cloudpaks/cp4d/templates/0000-operands-namespace.yaml b/config/cloudpaks/cp4d/templates/0000-operands-namespace.yaml new file mode 100644 index 00000000..31aef5e0 --- /dev/null +++ b/config/cloudpaks/cp4d/templates/0000-operands-namespace.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + creationTimestamp: null + name: {{.Values.metadata.operands_namespace}} +spec: {} +status: {} diff --git a/config/cloudpaks/cp4d/templates/0000-operators-namespace.yaml b/config/cloudpaks/cp4d/templates/0000-operators-namespace.yaml deleted file mode 100644 index 785540bb..00000000 --- a/config/cloudpaks/cp4d/templates/0000-operators-namespace.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ if not ( or ( eq ( default "" .Values.metadata.operators_namespace ) "ibm-common-services" ) ( eq .Values.metadata.common_services_namespace .Values.metadata.operators_namespace ) ) }} ---- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - name: {{.Values.metadata.operators_namespace}} -spec: {} -status: {} -{{ end }} diff --git a/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml b/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml index 8f90981a..da5d437e 100644 --- a/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml +++ b/config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml @@ -1,5 +1,5 @@ --- -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=information-setting-up-installation-environment-variables +# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-setting-up-installation-environment-variables apiVersion: batch/v1 kind: Job metadata: @@ -13,10 +13,21 @@ spec: spec: containers: - name: configure-cluster - image: icr.io/cpopen/cpd/olm-utils:latest + # Image associated with CPD CLI v13.0.1 @ https://github.com/IBM/cpd-cli/releases/tag/v13.0.1 + image: icr.io/cpopen/cpd/olm-utils-v2@sha256:7620c112def44374b9f53a8b5b3ef609be6d3a76fdd48b06f48e13ea3498a8f7 env: + - name: PROJECT_CERT_MANAGER + value: ibm-cert-manager + - name: PROJECT_LICENSE_SERVICE + value: ibm-licensing + - name: PROJECT_SCHEDULING_SERVICE + value: cpd-scheduler + - name: VERSION + value: {{.Values.version}} - name: COMPONENTS value: {{.Values.components}} + - name: IMAGE_ARCH + value: {{.Values.image_arch}} command: - /bin/bash - -c @@ -26,6 +37,34 @@ spec: result=0 + # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=cluster-installing-shared-components + bin/apply-cluster-components \ + --release=${VERSION:?} \ + --license_acceptance=true \ + --cert_manager_ns=${PROJECT_CERT_MANAGER:?} \ + --licensing_ns=${PROJECT_LICENSE_SERVICE:?} \ + && echo "INFO: Cert Manager and Licensing service installed." \ + && bin/apply-scheduler \ + --release=${VERSION} \ + --license_acceptance=true \ + --scheduler_ns=${PROJECT_SCHEDULING_SERVICE:?} \ + && echo "INFO: Scheduling service installed." \ + || result=1 + + if [[ ${COMPONENTS:?} =~ cognos_analytics ]] \ + || [[ ${COMPONENTS} =~ dv ]] \ + || [[ ${COMPONENTS} =~ db2 ]] \ + || [[ ${COMPONENTS} =~ bigsql ]] \ + || [[ ${COMPONENTS} =~ watson_discovery ]] \ + || [[ ${COMPONENTS} =~ wkc ]] \ + || [[ ${COMPONENTS} =~ ws ]] \ + || [[ ${COMPONENTS} =~ wml_accelerator ]]; then + echo "INFO: Must update CRI-O container settings depending on the target env." + else + echo "INFO: None of the components to be installed require crio-changes" + exit 0 + fi + OPENSHIFT_TYPE=self-managed platform=$(oc get Infrastructure cluster -o jsonpath={.status.platform}) case "${platform}" in @@ -46,23 +85,75 @@ spec: OPENSHIFT_TYPE=self-managed esac + ocp_version=$(oc get ClusterVersion version -o jsonpath='{.status.desired.version}' | cut -d "." -f 1,2) + if [ -z "${ocp_version}" ]; then + echo "ERROR: Unable to determine cluster version for ${cluster_name}" + exit 1 + fi + hypershift_deployment=$(oc get Infrastructure cluster \ -o jsonpath='{.metadata.labels.hypershift\.openshift\.io/managed}') - # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=settings-changing-cri-o-container - if [ "${OPENSHIFT_TYPE}" != "roks" ] && [ -z "${hypershift_deployment}" ]; then - if [[ ${COMPONENTS} =~ cognos_analytics ]] \ - || [[ ${COMPONENTS} =~ dv ]] \ - || [[ ${COMPONENTS} =~ db2 ]] \ - || [[ ${COMPONENTS} =~ bigsql ]] \ - || [[ ${COMPONENTS} =~ watson_discovery ]] \ - || [[ ${COMPONENTS} =~ wkc ]] \ - || [[ ${COMPONENTS} =~ ws ]] \ - || [[ ${COMPONENTS} =~ wml_accelerator ]]; then - echo "INFO: Changing CRI-O container settings" - bin/apply-crio --openshift-type=${OPENSHIFT_TYPE} --extra-vars="pid_limit=16384" \ - || result=1 - fi + # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=settings-changing-cri-o-container + crio="none" + if [ -n "${hypershift_deployment}" ]; then + crio="none" + elif [ "${OPENSHIFT_TYPE}" == "roks" ]; then + crio="none" + elif [ "${platform}" == "Azure" ]; then + crio="azure" + elif [ "${OPENSHIFT_TYPE}" == "self-managed" ] && [ "${ocp_version}" == "4.10" ]; then + crio="pid" + elif [ "${OPENSHIFT_TYPE}" == "self-managed" ] && [ "${ocp_version}" == "4.12" ]; then + crio="kubelet" + fi + + if [ "${crio}" == "pid" ]; then + echo "INFO: Changing CRI-O container settings" + bin/apply-crio --openshift-type=${OPENSHIFT_TYPE} \ + || result=1 + elif [ "${crio}" == "kubelet" ]; then + oc label machineconfigpool worker custom-crio=pid-limit --overwrite \ + && oc apply -f - << EOF + apiVersion: machineconfiguration.openshift.io/v1 + kind: KubeletConfig + metadata: + name: cpd-crio-kubeletconfig + spec: + kubeletConfig: + podPidsLimit: 16384 + machineConfigPoolSelector: + matchLabels: + custom-crio: pid-limit + EOF + oc get kubeletconfig.machineconfiguration.openshift.io/cpd-crio-kubeletconfig -o yaml + + oc wait kubeletconfig.machineconfiguration.openshift.io/cpd-crio-kubeletconfig \ + --for=condition=Success=true \ + --timeout=20s \ + || result=1 + elif [ "${crio}" == "azure" ]; then + oc apply -f - << EOF + apiVersion: machineconfiguration.openshift.io/v1 + kind: ContainerRuntimeConfig + metadata: + name: new-large-pidlimit + spec: + containerRuntimeConfig: + pidsLimit: 16384 + machineConfigPoolSelector: + matchExpressions: + - key: pools.operator.machineconfiguration.openshift.io/worker + operator: Exists + EOF + oc get no -o name \ + | grep compute \ + | awk '{system("oc debug " $1 " -- bash -lc \"chroot /host sudo crio-status config | grep pids_limit\" ")}' + + oc wait ContainerRuntimeConfig.machineconfiguration.openshift.io/new-large-pidlimit \ + --for=condition=Success=true \ + --timeout=20s \ + || result=1 fi # Not attempting to set the IBM entitlement key because it is diff --git a/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml b/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml index db7bf9be..0c16eecc 100644 --- a/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml +++ b/config/cloudpaks/cp4d/templates/0100-sync-install-olm.yaml @@ -1,5 +1,5 @@ --- -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=installing +# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=installing apiVersion: batch/v1 kind: Job metadata: @@ -14,18 +14,18 @@ spec: spec: containers: - name: install-olm - image: icr.io/cpopen/cpd/olm-utils:latest + image: icr.io/cpopen/cpd/olm-utils-v2@sha256:7620c112def44374b9f53a8b5b3ef609be6d3a76fdd48b06f48e13ea3498a8f7 env: - - name: PROJECT_CPFS_OPS - value: {{.Values.metadata.common_services_namespace}} - - name: PROJECT_CPD_OPS + - name: PROJECT_CPD_INST_OPERATORS value: {{.Values.metadata.operators_namespace}} - - name: PROJECT_CPD_INSTANCE - value: {{.Values.metadata.argocd_app_namespace}} + - name: PROJECT_CPD_INST_OPERANDS + value: {{.Values.metadata.operands_namespace}} - name: VERSION value: {{.Values.version}} - name: COMPONENTS value: {{.Values.components}} + - name: CPD_CLI_MANAGE_WORKSPACE + value: /tmp command: - /bin/bash - -c @@ -35,44 +35,48 @@ spec: result=0 - # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=cluster-creating-custom-sccs-services + # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=services-creating-informix-scc echo "INFO: Creating custom security context constraints for services." - # wkc only - if [[ ${COMPONENTS} =~ wkc ]]; then - bin/apply-scc \ - --cpd_instance_ns=${PROJECT_CPD_INSTANCE} \ - --components=wkc \ - || { - echo "ERROR: Failed to set SCC for WKC." - exit 1 - } - fi if [[ ${COMPONENTS} =~ informix ]]; then bin/apply-scc \ - --cpd_instance_ns=${PROJECT_CPD_INSTANCE} \ + --cpd_instance_ns=${PROJECT_CPD_INST_OPERANDS} \ --components=informix \ || { echo "ERROR: Failed to set SCC for Informix." - exit 1 + result=1 } fi - # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=si-creating-olm-objects - echo "INFO: Creating OLM objects for a specialized installation." - bin/apply-olm apply-olm \ + # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=data-installing-cloud-pak-foundational-services + echo "INFO: Installing foundational services" \ + && bin/authorize-instance-topology \ + --cpd_operator_ns=${PROJECT_CPD_INST_OPERATORS:?} \ + --cpd_instance_ns=${PROJECT_CPD_INST_OPERANDS:?} \ + && bin/setup-instance-topology \ + --release=${VERSION:?} \ + --cpd_operator_ns=${PROJECT_CPD_INST_OPERATORS:?} \ + --cpd_instance_ns=${PROJECT_CPD_INST_OPERANDS:?} \ + --license_acceptance=true \ + && bin/get-license \ + --release=${VERSION} \ + --license-type=SE \ + && echo "INFO: Creating OLM objects for a specialized installation." \ + && bin/apply-olm apply-olm \ --release=${VERSION} \ --components=${COMPONENTS} \ - --cs_ns=${PROJECT_CPFS_OPS} \ - --cpd_operator_ns=${PROJECT_CPD_OPS} \ - && bin/get-olm-artifacts \ - --subscription_ns=${PROJECT_CPFS_OPS} \ - && bin/get-olm-artifacts \ - --subscription_ns=${PROJECT_CPD_OPS} \ - && echo "INFO: OLM resources applied." \ - || { - echo "ERROR: Failed to apply OLM resources." - result=1 - } + --cpd_operator_ns=${PROJECT_CPD_INST_OPERATORS} \ + || result=1 + + # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=data-specifying-privileges-that-db2u-runs + oc apply -f - < /dev/null \ + oc get secret cpd-tls-secret \ + -n "${PROJECT_CPD_INST_OPERANDS}" 2> /dev/null \ && secret_found=1 \ || secret_found=0 @@ -59,24 +56,24 @@ spec: --confirm \ && sed -n `sed -n '/END CERTIFICATE/=' tls.crt | head -1`',$p' tls.crt | tail -n +2 > ca.crt \ && sed -i '/END/q' tls.crt \ - && oc delete secret cp4d-custom-tls-secret \ - -n "${TARGET_NAMESPACE}" \ + && oc delete secret cpd-tls-secret \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ --ignore-not-found=true \ - && oc create secret generic cp4d-custom-tls-secret \ + && oc create secret generic cpd-tls-secret \ --from-file=tls.crt=tls.crt \ --from-file=tls.key=tls.key \ --from-file=ca.crt=ca.crt \ - -n "${TARGET_NAMESPACE}" \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ && oc get route -l component=ibm-nginx \ - -n "${TARGET_NAMESPACE}" \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ -o 'jsonpath={.items[0].spec.host}{" "}{.items[0].spec.tls.termination}{" "}{.items[0].metadata.name}' \ && oc get route -l component=ibm-nginx \ - -n "${TARGET_NAMESPACE}" \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ && sed -i "/bin\/bash/a set -x" bin/setup-route \ && bin/setup-route \ - --cpd_instance_ns="${TARGET_NAMESPACE}" \ + --cpd_instance_ns="${PROJECT_CPD_INST_OPERANDS}" \ --route_type=passthrough \ - --route_secret=cp4d-custom-tls-secret \ + --route_secret=cpd-tls-secret \ && echo "INFO: Configured CPD route." \ || result=1 @@ -84,16 +81,16 @@ spec: echo "WARNING: Failed to configure CPD route. Attempting to recover." \ && ocp_domain=$(oc get ingress.config.openshift.io cluster -o jsonpath={.spec.domain}) \ && bin/setup-route \ - --cpd_instance_ns="${TARGET_NAMESPACE}" \ + --cpd_instance_ns="${PROJECT_CPD_INST_OPERANDS}" \ --route_type=passthrough \ - --route_secret=cp4d-custom-tls-secret \ - --custom_hostname=cpd-${TARGET_NAMESPACE}.${ocp_domain} \ + --route_secret=cpd-tls-secret \ + --custom_hostname=cpd-${PROJECT_CPD_INST_OPERANDS}.${ocp_domain} \ && result=0 \ && echo "INFO: Configured CPD route on second attempt." \ || { echo "ERROR: External secret not set." - oc delete secret cp4d-custom-tls-secret \ - -n "${TARGET_NAMESPACE}" \ + oc delete secret cpd-tls-secret \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ --ignore-not-found=true result=1 } diff --git a/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml b/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml index 97d3f3be..25830069 100644 --- a/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml +++ b/config/cloudpaks/cp4d/templates/0402-postsync-integrate-iam.yaml @@ -1,5 +1,5 @@ --- -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=environment-integrating-iam-service +# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=manage-setup-iam-integration apiVersion: batch/v1 kind: Job metadata: @@ -13,12 +13,10 @@ spec: spec: containers: - name: install-olm - image: icr.io/cpopen/cpd/olm-utils:latest + image: icr.io/cpopen/cpd/olm-utils-v2@sha256:7620c112def44374b9f53a8b5b3ef609be6d3a76fdd48b06f48e13ea3498a8f7 env: - - name: PROJECT_CPFS_OPS - value: {{.Values.metadata.common_services_namespace}} - - name: PROJECT_CPD_INSTANCE - value: {{.Values.metadata.argocd_app_namespace}} + - name: PROJECT_CPD_INST_OPERANDS + value: {{.Values.metadata.operands_namespace}} - name: IAM_INTEGRATION value: "{{.Values.iam_integration}}" command: @@ -30,9 +28,8 @@ spec: result=0 - # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=cluster-creating-custom-sccs-services iam_enabled=$(oc get zenservice lite-cr \ - -n "${PROJECT_CPD_INSTANCE}" \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ -o jsonpath='{.spec.iamIntegration}') if [ "${iam_enabled}" == "${IAM_INTEGRATION}" ]; then echo "INFO: IAM integration is already configured to ${IAM_INTEGRATION}." @@ -42,12 +39,12 @@ spec: echo "INFO: Setting IAM integration to ${IAM_INTEGRATION}." bin/setup-iam-integration \ --enable="${IAM_INTEGRATION}" \ - --cpd_instance_ns="${PROJECT_CPD_INSTANCE}" \ + --cpd_instance_ns="${PROJECT_CPD_INST_OPERANDS}" \ result=1 echo "INFO: IAM integration status" \ && oc get zenservice lite-cr \ - -n "${PROJECT_CPD_INSTANCE}" \ + -n "${PROJECT_CPD_INST_OPERANDS}" \ -o jsonpath='{.spec.iamIntegration}' exit ${result} diff --git a/config/cloudpaks/cp4d/values.yaml b/config/cloudpaks/cp4d/values.yaml index 4e2019f7..016159ae 100644 --- a/config/cloudpaks/cp4d/values.yaml +++ b/config/cloudpaks/cp4d/values.yaml @@ -3,12 +3,12 @@ repoURL: https://github.com/IBM/cloudpak-gitops serviceaccount: argocd_application_controller: openshift-gitops-argocd-application-controller metadata: - argocd_app_namespace: cpd + argocd_app_namespace: cp4d argocd_namespace: openshift-gitops - common_services_namespace: "set in parent app" - operators_namespace: "set in parent app" + operators_namespace: cp4d + operands_namespace: cp4d -# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=information-determining-which-components-install +# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install components: "set in parent app" storageclass: @@ -17,5 +17,6 @@ storageclass: targetRevision: main iam_integration: "set in presync-hook of parent app" +image_arch: "set in parent app" version: "set in parent app" diff --git a/docs/install.md b/docs/install.md index 25166daa..6651b800 100644 --- a/docs/install.md +++ b/docs/install.md @@ -406,7 +406,7 @@ This repository allows some light customizations to enable its reuse for demonst #### Cloud Pak for Data -The main Argo Application for the Cloud Pak (`config/argocd-cloudpaks/cp4i`) has a parameter named `components`, which contains a comma-separated list of components names matching the values in the [product documentation](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=information-determining-which-components-install). +The main Argo Application for the Cloud Pak (`config/argocd-cloudpaks/cp4d`) has a parameter named `components`, which contains a comma-separated list of components names matching the values in the [product documentation](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.7.x?topic=information-determining-which-components-install). Alter the values in this array with the element names found in the product documentation (e.g., `wml` for Watson Machine Learning) to define the list of components installed in the target cluster. diff --git a/tests/prebuild/yamllint-config.yaml b/tests/prebuild/yamllint-config.yaml index a7ffd76d..706f2e21 100644 --- a/tests/prebuild/yamllint-config.yaml +++ b/tests/prebuild/yamllint-config.yaml @@ -8,7 +8,6 @@ ignore: | config/argocd-cloudpaks/cp4waiops/templates/130-cp4waiops-ia-app.yaml config/cloudpaks/cp4a/operators/templates/0000-cp4ba-namespace.yaml config/cloudpaks/cp4a/operators/templates/0100-operator-group.yaml - config/cloudpaks/cp4d/templates/0000-operators-namespace.yaml config/cloudpaks/cp4i/install-prereqs/templates/0000-namespace.yaml config/cloudpaks/cp4i/install-prereqs/templates/0100-operator-group.yaml config/cloudpaks/cp4s/templates/subscriptions/050-cp4s-operator-group.yaml