diff --git a/README.md b/README.md index a925a25a..9dba98af 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,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 Business Automation | [23.0.1](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/23.0.1) | Multi-pattern starter deployment | | Cloud Pak for Data | [4.7.2](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 | diff --git a/config/argocd-cloudpaks/cp-shared/Chart.yaml b/config/argocd-cloudpaks/cp-shared/Chart.yaml index aa845b89..ea2c3af1 100644 --- a/config/argocd-cloudpaks/cp-shared/Chart.yaml +++ b/config/argocd-cloudpaks/cp-shared/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.1 +version: 0.6.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: "1.3.1" +appVersion: "1.3.2" diff --git a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml index e11d0ced..0ee1414c 100644 --- a/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml +++ b/config/argocd-cloudpaks/cp-shared/templates/0050-sync-common-service-maps.yaml @@ -39,9 +39,6 @@ spec: common-service-maps.yaml: | controlNamespace: {{.Values.dedicated_cs.control_namespace}} namespaceMapping: - - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4a}} - requested-from-namespace: - - {{.Values.dedicated_cs.namespace_mapping.cp4a}} - map-to-common-service-namespace: {{.Values.dedicated_cs.namespace_mapping.cp4d}} requested-from-namespace: - {{.Values.dedicated_cs.namespace_mapping.cp4d}} diff --git a/config/cloudpaks/cp-shared/operators/templates/0100-operator-group-cert-manager.yaml b/config/cloudpaks/cp-shared/operators/templates/0100-operator-group-cert-manager.yaml new file mode 100644 index 00000000..f223fb60 --- /dev/null +++ b/config/cloudpaks/cp-shared/operators/templates/0100-operator-group-cert-manager.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + annotations: + argocd.argoproj.io/sync-wave: "100" + creationTimestamp: null + name: ibm-cert-manager + namespace: {{.Values.metadata.cert_manager_namespace}} +spec: + upgradeStrategy: Default diff --git a/config/cloudpaks/cp-shared/operators/templates/0100-subscription-cert-manager.yaml b/config/cloudpaks/cp-shared/operators/templates/0100-subscription-cert-manager.yaml new file mode 100644 index 00000000..5cb2b481 --- /dev/null +++ b/config/cloudpaks/cp-shared/operators/templates/0100-subscription-cert-manager.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + annotations: + argocd.argoproj.io/sync-wave: "100" + creationTimestamp: null + name: ibm-cert-manager-operator + namespace: {{.Values.metadata.cert_manager_namespace}} +spec: + channel: v4.1 + installPlanApproval: Automatic + name: ibm-cert-manager-operator + source: ibm-operator-catalog + sourceNamespace: openshift-marketplace diff --git a/config/cloudpaks/cp-shared/operators/values.yaml b/config/cloudpaks/cp-shared/operators/values.yaml index cd891b63..d3e8b84e 100644 --- a/config/cloudpaks/cp-shared/operators/values.yaml +++ b/config/cloudpaks/cp-shared/operators/values.yaml @@ -1,6 +1,7 @@ --- metadata: argocd_namespace: openshift-gitops + cert_manager_namespace: ibm-cert-manager serviceaccount: argocd_application_controller: openshift-gitops-argocd-application-controller online_catalog_source_priority: -1 diff --git a/config/cloudpaks/cp4a/operators/Chart.yaml b/config/cloudpaks/cp4a/operators/Chart.yaml index dcf18fa3..ba955ace 100644 --- a/config/cloudpaks/cp4a/operators/Chart.yaml +++ b/config/cloudpaks/cp4a/operators/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.1 +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: "22.0.2" +appVersion: "23.0.1" diff --git a/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-for-demo.yaml b/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-for-demo.yaml index a9b34e05..580f933b 100644 --- a/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-for-demo.yaml +++ b/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-for-demo.yaml @@ -7,4 +7,4 @@ metadata: creationTimestamp: null name: ibm-cp4ba-anyuid imagePullSecrets: - - name: "admin.registrykey" + - name: "ibm-entitlement-key" diff --git a/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-scc.yaml b/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-scc.yaml index edb82a86..5ca5fab9 100644 --- a/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-scc.yaml +++ b/config/cloudpaks/cp4a/operators/templates/0021-service-accounts-scc.yaml @@ -3,7 +3,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: annotations: - argocd.argoproj.io/sync-wave: "22" + argocd.argoproj.io/sync-wave: "21" creationTimestamp: null name: system:openshift:scc:anyuid namespace: {{.Values.argocd_app_namespace}} diff --git a/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml b/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml index ab7d3ddf..5709dce4 100644 --- a/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml +++ b/config/cloudpaks/cp4a/operators/templates/0110-base-operator.yaml @@ -8,7 +8,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "110" spec: - channel: v22.2 + channel: v23.1 installPlanApproval: Automatic name: ibm-cp4a-operator source: ibm-operator-catalog diff --git a/config/cloudpaks/cp4a/resources/Chart.yaml b/config/cloudpaks/cp4a/resources/Chart.yaml index 62d4199f..d2be637d 100644 --- a/config/cloudpaks/cp4a/resources/Chart.yaml +++ b/config/cloudpaks/cp4a/resources/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.1 +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: "22.0.2" +appVersion: "23.0.1" diff --git a/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml b/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml index 13170f29..b901002b 100644 --- a/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml +++ b/config/cloudpaks/cp4a/resources/templates/0201-icp4a-cluster.yaml @@ -11,10 +11,10 @@ metadata: argocd.argoproj.io/sync-wave: "201" namespace: {{.Values.argocd_app_namespace}} spec: - appVersion: 22.0.2 + appVersion: 23.0.1 olm_deployment_type: Starter olm_ibm_license: true - olm_starter_application: false + olm_starter_application: true olm_starter_content: false olm_starter_decisions: true olm_starter_decisions_ads: false @@ -26,6 +26,7 @@ spec: olm_production_decisions: false olm_production_content: false olm_production_workflow: false + olm_production_workflow_process_service: false initialize_configuration: ic_ldap_creation: ic_ldap_admins_groups_name: @@ -95,6 +96,7 @@ spec: bai: false application: app_designer: false + ae_data_persistence: false content: bai: false cmis: false @@ -108,8 +110,12 @@ spec: decisionCenter: false decisionRunner: false decisionServerRuntime: false + wfps_authoring: + bai: false + pfs: false workfow_authoring: bai: false + pfs: false workfow_runtime: bai: false olm_starter_option: @@ -145,7 +151,7 @@ spec: database_port: '' database_servername: '' dc_database_ssl_enabled: true - dc_database_type: db2 + dc_database_type: postgresql dc_hadr_max_retries_for_client_reroute: 3 dc_hadr_retry_interval_for_client_reroute: 15 dc_hadr_standby_ip: '' @@ -158,7 +164,7 @@ spec: dc_common_database_name: '' dc_common_database_port: '' dc_common_ssl_enabled: true - dc_database_type: db2 + dc_database_type: postgresql dc_ssl_secret_name: '' dc_icn_datasource: database_name: '' @@ -292,7 +298,12 @@ spec: database_precheck: true dc_ssl_enabled: true shared_configuration: + sc_iam: + default_admin_username: '' trusted_certificate_list: [] + sc_common_service: + operator_namespace: '' + services_namespace: '' storage_configuration: sc_block_storage_classname: {{.Values.storageclass.block}} sc_dynamic_storage_classname: {{.Values.storageclass.gold}} @@ -301,7 +312,7 @@ spec: sc_slow_file_storage_classname: '' encryption_key_secret: '' external_tls_certificate_secret: '' - olm_sc_content_initialization: true + olm_sc_content_initialization: false olm_sc_content_verification: false root_ca_secret: icp4a-root-ca sc_deployment_baw_license: non-production