From e7296b429360fb4b75227d6fcba87500bbc89953 Mon Sep 17 00:00:00 2001 From: Denilson Nastacio Date: Thu, 15 Jun 2023 14:18:45 -0400 Subject: [PATCH] feat: Update CP4I operator channels Signed-off-by: Denilson Nastacio --- config/cloudpaks/cp4i/install-apic/Chart.yaml | 2 +- .../templates/0100-subscription-apic.yaml | 2 +- .../templates/0200-api-connect.yaml | 4 +- config/cloudpaks/cp4i/install-mq/Chart.yaml | 2 +- .../templates/0100-subscription-mq.yaml | 2 +- .../templates/0210-queue-manager.yaml | 2 +- .../cp4i/install-platform/Chart.yaml | 2 +- .../templates/0020-argocd-role.yaml | 2 +- .../0020-cloudpaks-default-role.yaml | 2 +- .../templates/0020-common-services-role.yaml | 2 +- .../0021-cloudpaks-default-binding.yaml | 2 +- .../0022-cloudpaks-cluster-role-binding.yaml | 2 +- .../templates/0030-argocd-role-binding.yaml | 2 +- .../0030-cloudpaks-role-binding.yaml | 2 +- .../0030-common-services-role-binding.yaml | 2 +- .../0040-service-account-installer.yaml | 2 +- .../0050-sync-configure-network-policy.yaml | 66 ------------------- 17 files changed, 17 insertions(+), 83 deletions(-) delete mode 100644 config/cloudpaks/cp4i/install-prereqs/templates/0050-sync-configure-network-policy.yaml diff --git a/config/cloudpaks/cp4i/install-apic/Chart.yaml b/config/cloudpaks/cp4i/install-apic/Chart.yaml index 0d2cfd75..155bda5f 100644 --- a/config/cloudpaks/cp4i/install-apic/Chart.yaml +++ b/config/cloudpaks/cp4i/install-apic/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.3.0 +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 diff --git a/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml b/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml index c6aa5a26..a613ce6f 100644 --- a/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml +++ b/config/cloudpaks/cp4i/install-apic/templates/0100-subscription-apic.yaml @@ -9,7 +9,7 @@ metadata: name: ibm-apiconnect namespace: {{.Values.metadata.argocd_app_namespace}} spec: - channel: v3.2 + channel: v3.3 installPlanApproval: Automatic name: ibm-apiconnect source: ibm-operator-catalog diff --git a/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml b/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml index be62365b..203b4e51 100644 --- a/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml +++ b/config/cloudpaks/cp4i/install-apic/templates/0200-api-connect.yaml @@ -17,7 +17,7 @@ spec: accept: true use: nonproduction # https://www.ibm.com/docs/en/api-connect/10.0.5.x_lts?topic=requirements-api-connect-licenses - license: L-GVEN-GFUPVE + license: L-VQYA-YNM22H storageClassName: {{.Values.storageclass.rwo}} profile: n1xc10.m48 - version: 10.0.5.2 + version: 10.0.5.3 diff --git a/config/cloudpaks/cp4i/install-mq/Chart.yaml b/config/cloudpaks/cp4i/install-mq/Chart.yaml index 5fe7c8b5..dc720ed1 100644 --- a/config/cloudpaks/cp4i/install-mq/Chart.yaml +++ b/config/cloudpaks/cp4i/install-mq/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.3.0 +version: 0.3.1 # 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/cp4i/install-mq/templates/0100-subscription-mq.yaml b/config/cloudpaks/cp4i/install-mq/templates/0100-subscription-mq.yaml index c7f1ad79..6d416b77 100644 --- a/config/cloudpaks/cp4i/install-mq/templates/0100-subscription-mq.yaml +++ b/config/cloudpaks/cp4i/install-mq/templates/0100-subscription-mq.yaml @@ -8,7 +8,7 @@ metadata: name: ibm-mq-ibm-operator namespace: {{.Values.metadata.argocd_app_namespace}} spec: - channel: v2.2 + channel: v2.3 installPlanApproval: Automatic name: ibm-mq source: ibm-operator-catalog diff --git a/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml b/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml index 69253b9f..4b8cc13d 100644 --- a/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml +++ b/config/cloudpaks/cp4i/install-mq/templates/0210-queue-manager.yaml @@ -8,7 +8,7 @@ metadata: name: case-queues-1-qmgr namespace: {{.Values.argocd_app_namespace}} spec: - version: 9.3.1.0-r2 + version: 9.3.2.1-r2 license: accept: true # http://ibm.biz/BdqvCF diff --git a/config/cloudpaks/cp4i/install-platform/Chart.yaml b/config/cloudpaks/cp4i/install-platform/Chart.yaml index 25b31b03..21f18423 100644 --- a/config/cloudpaks/cp4i/install-platform/Chart.yaml +++ b/config/cloudpaks/cp4i/install-platform/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.3.0 +version: 0.3.1 # 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/cp4i/install-prereqs/templates/0020-argocd-role.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0020-argocd-role.yaml index 9d21d59f..b7825a13 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0020-argocd-role.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0020-argocd-role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "21" creationTimestamp: null name: argocd-cp4i-role diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0020-cloudpaks-default-role.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0020-cloudpaks-default-role.yaml index 67d7c85a..c2e71c17 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0020-cloudpaks-default-role.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0020-cloudpaks-default-role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "21" creationTimestamp: null name: ibm-cp4i-role diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0020-common-services-role.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0020-common-services-role.yaml index ea86c7cb..0e9cc525 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0020-common-services-role.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0020-common-services-role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "21" creationTimestamp: null name: common-services-cp4i-role diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0021-cloudpaks-default-binding.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0021-cloudpaks-default-binding.yaml index 62a433b2..4cd2ed9d 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0021-cloudpaks-default-binding.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0021-cloudpaks-default-binding.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "21" creationTimestamp: null name: ibm-cp4i-binding diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0022-cloudpaks-cluster-role-binding.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0022-cloudpaks-cluster-role-binding.yaml index ee23fc4a..437d46b4 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0022-cloudpaks-cluster-role-binding.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0022-cloudpaks-cluster-role-binding.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "22" creationTimestamp: null name: ibm-cloudpaks-cp4i-cr-binding diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0030-argocd-role-binding.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0030-argocd-role-binding.yaml index 664cc2d8..70420738 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0030-argocd-role-binding.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0030-argocd-role-binding.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "30" creationTimestamp: null name: argocd-cp4i-binding diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0030-cloudpaks-role-binding.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0030-cloudpaks-role-binding.yaml index 7b9edc54..19159003 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0030-cloudpaks-role-binding.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0030-cloudpaks-role-binding.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "30" creationTimestamp: null name: cloudpaks-cp4i-binding diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0030-common-services-role-binding.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0030-common-services-role-binding.yaml index 63fb1327..93871da3 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0030-common-services-role-binding.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0030-common-services-role-binding.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "30" creationTimestamp: null name: common-services-cp4i-binding diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0040-service-account-installer.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0040-service-account-installer.yaml index cdfea6c5..e4cc4675 100644 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0040-service-account-installer.yaml +++ b/config/cloudpaks/cp4i/install-prereqs/templates/0040-service-account-installer.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: - argocd.argoproj.io/sync-options: "Replace=true" + argocd.argoproj.io/sync-wave: "40" creationTimestamp: null name: "{{.Values.serviceaccount.ibm_cloudpaks_installer}}" diff --git a/config/cloudpaks/cp4i/install-prereqs/templates/0050-sync-configure-network-policy.yaml b/config/cloudpaks/cp4i/install-prereqs/templates/0050-sync-configure-network-policy.yaml deleted file mode 100644 index d72a9f5b..00000000 --- a/config/cloudpaks/cp4i/install-prereqs/templates/0050-sync-configure-network-policy.yaml +++ /dev/null @@ -1,66 +0,0 @@ -# https://www.ibm.com/docs/en/cloud-paks/cp-integration/2021.2?topic=configuration-installation -# -# Some Red Hat OpenShift clusters have additional network policies configured to secure pod communication traffic, -# which can block external traffic and communication between namespaces. Extra configuration is then required to -# allow external traffic to reach the routes. ---- -apiVersion: batch/v1 -kind: Job -metadata: - annotations: - argocd.argoproj.io/hook: Sync - argocd.argoproj.io/sync-wave: "50" - name: sync-cp4i-network-policy - namespace: {{.Values.metadata.argocd_app_namespace}} -spec: - template: - spec: - containers: - - name: config - image: quay.io/openshift/origin-cli:latest - imagePullPolicy: IfNotPresent - command: - - /bin/sh - - -c - - | - set -eo pipefail - set -x - - is_managed_ocp=0 - managed_ocp=$(oc get Infrastructure cluster \ - -o jsonpath='{.status.platformStatus.*.resourceTags[?(@.key=="red-hat-managed")].value}' || is_managed_ocp=0) - if [ "${managed_ocp}" == "true" ]; then - echo "INFO: Do not attempt to adjust network policy for managed OCP environments." - exit 0 - fi - - default_policy=$(oc get namespace default -o jsonpath={.metadata.labels.'network\.openshift\.io/policy-group'}) \ - || { - echo "ERROR: Unable to get default ingress policy ." - exit 1 - } - if [ "${default_policy}" == "ingress" ]; then - echo "INFO: Default network policy is already \"ingress\"." - exit - else - no_strategy=0 - strategy=$(oc get ingresscontroller default \ - -n openshift-ingress-operator \ - -o jsonpath={.status.endpointPublishingStrategy.type}) \ - || { - echo "ERROR: Getting ingress controller strategy failed." - no_strategy=1 - } - if [ "${strategy}" == "HostNetwork" ] || [ "${no_strategy}" -eq 1 ]; then - oc label namespace default 'network.openshift.io/policy-group=ingress' --overwrite \ - && echo "INFO: Default network policy set to \"ingress\"." \ - || { - echo "ERROR: Patching network policy labels failed." - exit 1 - } - fi - fi - - restartPolicy: Never - serviceAccountName: {{.Values.serviceaccount.ibm_cloudpaks_installer}} - backoffLimit: 1