From 60651546c01d7391bde9e9dcf6cd86a380e6001d Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 09:55:39 +0000 Subject: [PATCH 01/25] [patch] update playbook with odh specific version --- ibm/mas_devops/roles/odh/tasks/main.yml | 8 ++--- .../roles/odh/tasks/odh-operator.yml | 31 +++++++++++-------- .../odh/templates/odh/subscription.yml.j2 | 12 +++++++ 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 diff --git a/ibm/mas_devops/roles/odh/tasks/main.yml b/ibm/mas_devops/roles/odh/tasks/main.yml index bda0b9793..7b0ca5f33 100644 --- a/ibm/mas_devops/roles/odh/tasks/main.yml +++ b/ibm/mas_devops/roles/odh/tasks/main.yml @@ -53,7 +53,7 @@ - dsci_lookup.resources[0].status is defined - dsci_lookup.resources[0].status.phase is defined - dsci_lookup.resources[0].status.phase == 'Ready' - retries: 10 + retries: 20 delay: 30 # Create Data Science Cluster @@ -73,7 +73,7 @@ - dsc_lookup.resources[0].status is defined - dsc_lookup.resources[0].status.phase is defined - dsc_lookup.resources[0].status.phase == 'Ready' - retries: 10 + retries: 20 delay: 30 # Create Data Science Pipelines Applications @@ -93,7 +93,7 @@ - dspa_lookup.resources is defined - dspa_lookup.resources | length > 0 - dspa_lookup.resources | json_query('[*].status.conditions[?type==`Ready`][].status') | select ('match','True') | list | length == 1 - retries: 10 + retries: 20 delay: 30 # Wait until the pipeline-runner-instance service account is available @@ -105,7 +105,7 @@ name: pipeline-runner-instance namespace: "{{ aibroker_namespace }}" register: pipelinerunner_sa_lookup - retries: 10 # Up to 10 minutes + retries: 20 # Up to 10 minutes delay: 60 # Every 1 minute until: - pipelinerunner_sa_lookup.resources is defined diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index cd75ca52a..749e04f3b 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -1,21 +1,26 @@ --- # Install Operator & create entitlement openshift-odh # ----------------------------------------------------------------------------- -- name: "Install Openshift odh Operator" - ibm.mas_devops.apply_subscription: - namespace: "{{ openshift_namespace }}" - package_name: "opendatahub-operator" - package_channel: "{{ odh_channel }}" - catalog_source: "{{ odh_catalog_source }}" - register: subscription +# - name: "Install Openshift odh Operator" +# ibm.mas_devops.apply_subscription: +# namespace: "{{ openshift_namespace }}" +# package_name: "opendatahub-operator" +# package_channel: "{{ odh_channel }}" +# catalog_source: "{{ odh_catalog_source }}" +# register: subscription -# Wait until the Opendata Hub CRD is available -# ----------------------------------------------------------------------------- -- name: "Wait until the Opendata Hub CRD is available" - include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" - vars: - crd_name: knativeservings.operator.knative.dev +# # Wait until the Opendata Hub CRD is available +# # ----------------------------------------------------------------------------- +# - name: "Wait until the Opendata Hub CRD is available" +# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" +# vars: +# crd_name: knativeservings.operator.knative.dev + +- name: "Install Openshift odh Operator specific version" + kubernetes.core.k8s: + apply: yes + definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" - name: Await availability of ODH Install Plans pause: diff --git a/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 new file mode 100644 index 000000000..f9a51459f --- /dev/null +++ b/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 @@ -0,0 +1,12 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: opendatahub-operator + namespace: openshift-operators +spec: + channel: "{{ odh_channel }}" + installPlanApproval: Manual + name: opendatahub-operator + source: "{{ odh_catalog_source }}" + sourceNamespace: openshift-marketplace + startingCSV: "{{ odh_operator_version }}" From 4e9a29263ef899cf24f4b70fab2982beda7e5997 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 09:56:21 +0000 Subject: [PATCH 02/25] [patch] fix indent --- .../roles/odh/templates/odh/subscription.yml.j2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 index f9a51459f..fd5aadfa7 100644 --- a/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 +++ b/ibm/mas_devops/roles/odh/templates/odh/subscription.yml.j2 @@ -1,12 +1,12 @@ apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: - name: opendatahub-operator - namespace: openshift-operators + name: opendatahub-operator + namespace: openshift-operators spec: - channel: "{{ odh_channel }}" - installPlanApproval: Manual - name: opendatahub-operator - source: "{{ odh_catalog_source }}" - sourceNamespace: openshift-marketplace - startingCSV: "{{ odh_operator_version }}" + channel: "{{ odh_channel }}" + installPlanApproval: Manual + name: opendatahub-operator + source: "{{ odh_catalog_source }}" + sourceNamespace: openshift-marketplace + startingCSV: "{{ odh_operator_version }}" From 5c1c0c698fef87930fddc4868b48d8a1e34ae8be Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 10:18:55 +0000 Subject: [PATCH 03/25] [patch] final commit --- ibm/mas_devops/roles/odh/tasks/odh-operator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index 749e04f3b..a0404e731 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -17,7 +17,7 @@ # vars: # crd_name: knativeservings.operator.knative.dev -- name: "Install Openshift odh Operator specific version" +- name: "Install Openshift odh Operator specific version" # enable this temporary until find a way to use latest ODH versions kubernetes.core.k8s: apply: yes definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" From 7d8be9c68aceb9cc5e5c3cac839ad6522f923cec Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 11:41:59 +0000 Subject: [PATCH 04/25] [patch] add comment to alternative ODH deployment --- ibm/mas_devops/roles/odh/tasks/odh-operator.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index a0404e731..9b324d8a4 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -17,7 +17,8 @@ # vars: # crd_name: knativeservings.operator.knative.dev -- name: "Install Openshift odh Operator specific version" # enable this temporary until find a way to use latest ODH versions +# enable following role temporary until find a way to use latest ODH versions and switch to apply_subscription role +- name: "Install Openshift odh Operator specific version" kubernetes.core.k8s: apply: yes definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" From 68c3c3cef9da1f9477c0f6021e24699bf811f06a Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 11:59:32 +0000 Subject: [PATCH 05/25] [patch] add alternate way to install openshift serverless --- .../roles/odh/tasks/serverless-operator.yml | 32 +++++++++++-------- .../templates/serverless/subscription.yml.j2 | 11 +++++++ 2 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 diff --git a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml index 727860b11..0431b2cfc 100644 --- a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml @@ -1,18 +1,24 @@ --- # 1. Install Operator & create entitlement openshift-serverless # ----------------------------------------------------------------------------- -- name: "Install Openshift Serverless Operator" - ibm.mas_devops.apply_subscription: - namespace: "{{ serverless_namespace }}" - package_name: "serverless-operator" - package_channel: "{{ serverless_channel }}" - catalog_source: "{{ serverless_catalog_source }}" - register: subscription +# - name: "Install Openshift Serverless Operator" +# ibm.mas_devops.apply_subscription: +# namespace: "{{ serverless_namespace }}" +# package_name: "serverless-operator" +# package_channel: "{{ serverless_channel }}" +# catalog_source: "{{ serverless_catalog_source }}" +# register: subscription -# 2. Wait until the Serverless CRD is available -# ----------------------------------------------------------------------------- -- name: "Wait until the Serverless CRD is available" - include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" - vars: - crd_name: knativeservings.operator.knative.dev +# # 2. Wait until the Serverless CRD is available +# # ----------------------------------------------------------------------------- +# - name: "Wait until the Serverless CRD is available" +# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" +# vars: +# crd_name: knativeservings.operator.knative.dev + +# enable following role temporary until find a way to use openshift-serverless and switch to apply_subscription role +- name: "Install Openshift Serverless Operator" + kubernetes.core.k8s: + apply: yes + definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}" diff --git a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 new file mode 100644 index 000000000..80923de4c --- /dev/null +++ b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 @@ -0,0 +1,11 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: serverless-operator + namespace: openshift-serverless +spec: + channel: stable + installPlanApproval: Automatic + name: serverless-operator + source: redhat-operators + sourceNamespace: openshift-marketplace From 055bf218b27306143d68f634fbd91ed00aa6bfe8 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 12:02:45 +0000 Subject: [PATCH 06/25] [patch] restored servermesh operator deployment --- .../roles/odh/tasks/odh-operator.yml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index 9b324d8a4..e041cc683 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -1,27 +1,27 @@ --- # Install Operator & create entitlement openshift-odh # ----------------------------------------------------------------------------- -# - name: "Install Openshift odh Operator" -# ibm.mas_devops.apply_subscription: -# namespace: "{{ openshift_namespace }}" -# package_name: "opendatahub-operator" -# package_channel: "{{ odh_channel }}" -# catalog_source: "{{ odh_catalog_source }}" -# register: subscription +- name: "Install Openshift odh Operator" + ibm.mas_devops.apply_subscription: + namespace: "{{ openshift_namespace }}" + package_name: "opendatahub-operator" + package_channel: "{{ odh_channel }}" + catalog_source: "{{ odh_catalog_source }}" + register: subscription -# # Wait until the Opendata Hub CRD is available -# # ----------------------------------------------------------------------------- -# - name: "Wait until the Opendata Hub CRD is available" -# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" -# vars: -# crd_name: knativeservings.operator.knative.dev +# Wait until the Opendata Hub CRD is available +# ----------------------------------------------------------------------------- +- name: "Wait until the Opendata Hub CRD is available" + include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" + vars: + crd_name: knativeservings.operator.knative.dev # enable following role temporary until find a way to use latest ODH versions and switch to apply_subscription role -- name: "Install Openshift odh Operator specific version" - kubernetes.core.k8s: - apply: yes - definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" +# - name: "Install Openshift odh Operator specific version" +# kubernetes.core.k8s: +# apply: yes +# definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" - name: Await availability of ODH Install Plans pause: From c116b7c2792476b6031e4063c50428f3f7433e8f Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 12:11:55 +0000 Subject: [PATCH 07/25] [patch] restore alternative install serverless --- .../roles/odh/tasks/odh-operator.yml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index e041cc683..8aec667c4 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -1,27 +1,27 @@ --- -# Install Operator & create entitlement openshift-odh -# ----------------------------------------------------------------------------- -- name: "Install Openshift odh Operator" - ibm.mas_devops.apply_subscription: - namespace: "{{ openshift_namespace }}" - package_name: "opendatahub-operator" - package_channel: "{{ odh_channel }}" - catalog_source: "{{ odh_catalog_source }}" - register: subscription +# # Install Operator & create entitlement openshift-odh +# # ----------------------------------------------------------------------------- +# - name: "Install Openshift odh Operator" +# ibm.mas_devops.apply_subscription: +# namespace: "{{ openshift_namespace }}" +# package_name: "opendatahub-operator" +# package_channel: "{{ odh_channel }}" +# catalog_source: "{{ odh_catalog_source }}" +# register: subscription -# Wait until the Opendata Hub CRD is available -# ----------------------------------------------------------------------------- -- name: "Wait until the Opendata Hub CRD is available" - include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" - vars: - crd_name: knativeservings.operator.knative.dev +# # Wait until the Opendata Hub CRD is available +# # ----------------------------------------------------------------------------- +# - name: "Wait until the Opendata Hub CRD is available" +# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" +# vars: +# crd_name: knativeservings.operator.knative.dev # enable following role temporary until find a way to use latest ODH versions and switch to apply_subscription role -# - name: "Install Openshift odh Operator specific version" -# kubernetes.core.k8s: -# apply: yes -# definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" +- name: "Install Openshift odh Operator specific version" + kubernetes.core.k8s: + apply: yes + definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" - name: Await availability of ODH Install Plans pause: From 57567d6ab9b5e05a87e98ad9386de45de608103b Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 12:20:05 +0000 Subject: [PATCH 08/25] [patch] update controller version --- ibm/mas_devops/roles/kmodels/vars/main.yml | 2 +- ibm/mas_devops/roles/odh/tasks/main.yml | 2 +- .../roles/odh/tasks/odh-operator.yml | 2 +- .../roles/odh/tasks/serverless-operator.yml | 36 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 3e879806f..8359bca5e 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,7 +2,7 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.1 +mas_aibroker_controller_tag: 1.0.2 controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store mas_aibroker_store_tag: 1.0.1 diff --git a/ibm/mas_devops/roles/odh/tasks/main.yml b/ibm/mas_devops/roles/odh/tasks/main.yml index 7b0ca5f33..1ccfaa4c0 100644 --- a/ibm/mas_devops/roles/odh/tasks/main.yml +++ b/ibm/mas_devops/roles/odh/tasks/main.yml @@ -73,7 +73,7 @@ - dsc_lookup.resources[0].status is defined - dsc_lookup.resources[0].status.phase is defined - dsc_lookup.resources[0].status.phase == 'Ready' - retries: 20 + retries: 30 delay: 30 # Create Data Science Pipelines Applications diff --git a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml index 8aec667c4..aa9f04f2d 100644 --- a/ibm/mas_devops/roles/odh/tasks/odh-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/odh-operator.yml @@ -18,7 +18,7 @@ # crd_name: knativeservings.operator.knative.dev # enable following role temporary until find a way to use latest ODH versions and switch to apply_subscription role -- name: "Install Openshift odh Operator specific version" +- name: "Install Openshift odh Operator specific version" kubernetes.core.k8s: apply: yes definition: "{{ lookup('template', 'templates/odh/subscription.yml.j2') }}" diff --git a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml index 0431b2cfc..cfe1c27ce 100644 --- a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml @@ -1,24 +1,24 @@ --- # 1. Install Operator & create entitlement openshift-serverless # ----------------------------------------------------------------------------- -# - name: "Install Openshift Serverless Operator" -# ibm.mas_devops.apply_subscription: -# namespace: "{{ serverless_namespace }}" -# package_name: "serverless-operator" -# package_channel: "{{ serverless_channel }}" -# catalog_source: "{{ serverless_catalog_source }}" -# register: subscription +- name: "Install Openshift Serverless Operator" + ibm.mas_devops.apply_subscription: + namespace: "{{ serverless_namespace }}" + package_name: "serverless-operator" + package_channel: "{{ serverless_channel }}" + catalog_source: "{{ serverless_catalog_source }}" + register: subscription -# # 2. Wait until the Serverless CRD is available -# # ----------------------------------------------------------------------------- -# - name: "Wait until the Serverless CRD is available" -# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" -# vars: -# crd_name: knativeservings.operator.knative.dev +# 2. Wait until the Serverless CRD is available +# ----------------------------------------------------------------------------- +- name: "Wait until the Serverless CRD is available" + include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" + vars: + crd_name: knativeservings.operator.knative.dev -# enable following role temporary until find a way to use openshift-serverless and switch to apply_subscription role -- name: "Install Openshift Serverless Operator" - kubernetes.core.k8s: - apply: yes - definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}" +# # enable following role temporary until find a way to use openshift-serverless and switch to apply_subscription role +# - name: "Install Openshift Serverless Operator" +# kubernetes.core.k8s: +# apply: yes +# definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}" From c5afd1c393024c5a21e37eec93e583bbe1b3d270 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 13:03:24 +0000 Subject: [PATCH 09/25] [patch] update controller version --- ibm/mas_devops/roles/kmodels/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 8359bca5e..845a8328a 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,7 +2,7 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.2 +mas_aibroker_controller_tag: 1.0.2-pre.dev10 controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store mas_aibroker_store_tag: 1.0.1 From 5a3be95277ac51e14002d0a15227a257a331bbf3 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 13:06:36 +0000 Subject: [PATCH 10/25] [patch] update version --- ibm/mas_devops/roles/kmodels/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 845a8328a..3ac21b8d4 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,7 +2,7 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.2-pre.dev10 +mas_aibroker_controller_tag: 1.0.2-pre.dev10x controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store mas_aibroker_store_tag: 1.0.1 From f4defbee3f231aa63e9c35fb1e4db95878d27197 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 15:02:12 +0000 Subject: [PATCH 11/25] [patch] added OG --- .../roles/odh/tasks/serverless-operator.yml | 38 +++++++++---------- .../templates/serverless/subscription.yml.j2 | 6 +++ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml index cfe1c27ce..3381ca66e 100644 --- a/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml +++ b/ibm/mas_devops/roles/odh/tasks/serverless-operator.yml @@ -1,24 +1,24 @@ --- -# 1. Install Operator & create entitlement openshift-serverless -# ----------------------------------------------------------------------------- -- name: "Install Openshift Serverless Operator" - ibm.mas_devops.apply_subscription: - namespace: "{{ serverless_namespace }}" - package_name: "serverless-operator" - package_channel: "{{ serverless_channel }}" - catalog_source: "{{ serverless_catalog_source }}" - register: subscription +# # 1. Install Operator & create entitlement openshift-serverless +# # ----------------------------------------------------------------------------- +# - name: "Install Openshift Serverless Operator" +# ibm.mas_devops.apply_subscription: +# namespace: "{{ serverless_namespace }}" +# package_name: "serverless-operator" +# package_channel: "{{ serverless_channel }}" +# catalog_source: "{{ serverless_catalog_source }}" +# register: subscription -# 2. Wait until the Serverless CRD is available -# ----------------------------------------------------------------------------- -- name: "Wait until the Serverless CRD is available" - include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" - vars: - crd_name: knativeservings.operator.knative.dev +# # 2. Wait until the Serverless CRD is available +# # ----------------------------------------------------------------------------- +# - name: "Wait until the Serverless CRD is available" +# include_tasks: "{{ role_path }}/../../common_tasks/wait_for_crd.yml" +# vars: +# crd_name: knativeservings.operator.knative.dev # # enable following role temporary until find a way to use openshift-serverless and switch to apply_subscription role -# - name: "Install Openshift Serverless Operator" -# kubernetes.core.k8s: -# apply: yes -# definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}" +- name: "Install Openshift Serverless Operator" + kubernetes.core.k8s: + apply: yes + definition: "{{ lookup('template', 'templates/serverless/subscription.yml.j2') }}" diff --git a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 index 80923de4c..36e855bf5 100644 --- a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 +++ b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 @@ -1,3 +1,9 @@ +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: serverless + namespace: openshift-serverless +-- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: From 401db3f0ca66100e82fd074d6c01201f3c9fd7e8 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 15:09:13 +0000 Subject: [PATCH 12/25] [patch] fix subscription and add OG --- .../roles/odh/templates/serverless/subscription.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 index 36e855bf5..e1ba94a9d 100644 --- a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 +++ b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 @@ -3,7 +3,7 @@ kind: OperatorGroup metadata: name: serverless namespace: openshift-serverless --- +--- apiVersion: operators.coreos.com/v1alpha1 kind: Subscription metadata: From e4b042d7786c03c105373130b55de0be928b9cae Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 5 Dec 2024 15:31:39 +0000 Subject: [PATCH 13/25] [patch] update OG name --- .../roles/odh/templates/serverless/subscription.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 index e1ba94a9d..62c2f6785 100644 --- a/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 +++ b/ibm/mas_devops/roles/odh/templates/serverless/subscription.yml.j2 @@ -1,7 +1,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: serverless + name: operatorgroup namespace: openshift-serverless --- apiVersion: operators.coreos.com/v1alpha1 From 478a92006e7ec40a9c0e78f9ebb7d35cd45b4e51 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 9 Dec 2024 14:29:18 +0000 Subject: [PATCH 14/25] Squashed commit of the following: commit 91bd67beb1637d11677e8d835594eb26dbd07da3 Author: Ian Boden <82514609+IanBoden@users.noreply.github.com> Date: Mon Dec 9 10:32:54 2024 +0000 [patch] reinstate zenmetastore and couchdb workarounds for cpd 4.8 (#1580) commit aa05d8a589d8334149fcd53c66d5fcea01977d07 Author: Rawa <61942902+rawa-resul@users.noreply.github.com> Date: Fri Dec 6 16:32:24 2024 +0000 [patch] Fix label_selectors pattern (#1586) Co-authored-by: Rawa Resul commit e0ba0decf64579d7b021e16e68d866f9704c6a5e Author: Parveen Kumar Date: Fri Dec 6 19:23:46 2024 +0530 [minor] Support December catalog (#1562) Co-authored-by: Anil Prajapati Co-authored-by: Jon Levell Co-authored-by: Jon Levell Co-authored-by: Ian Boden <82514609+IanBoden@users.noreply.github.com> Co-authored-by: Ian Boden Co-authored-by: Anil Prajapati <169060963+anilprajapatiibm@users.noreply.github.com> Co-authored-by: Terence Quinn Co-authored-by: David Parker Co-authored-by: Rawa Resul Co-authored-by: Rawa <61942902+rawa-resul@users.noreply.github.com> --- build/bin/build-collection.sh | 4 +- docs/playbooks/ocp.md | 6 +- .../common_vars/compatibility_matrix.yml | 13 ++ .../playbooks/mirror_add_assist.yml | 8 +- ibm/mas_devops/playbooks/mirror_add_iot.yml | 8 +- .../playbooks/mirror_add_manage.yml | 4 +- .../playbooks/mirror_add_monitor.yml | 8 +- .../playbooks/mirror_add_optimizer.yml | 4 +- .../playbooks/mirror_add_predict.yml | 4 +- .../playbooks/mirror_add_visualinspection.yml | 4 +- .../playbooks/mirror_dependencies.yml | 66 ++++++++++- .../playbooks/ocp_fyre_provision.yml | 2 +- .../playbooks/ocp_roks_provision.yml | 2 +- ibm/mas_devops/plugins/filter/filters.py | 11 ++ .../roles/cp4d/tasks/install-cp4d.yml | 9 ++ .../cp4d/tasks/wait/wait-zenmetastore-edb.yml | 112 ++++++++++++++++++ .../cp4d_service/tasks/wait/wait-ccs.yml | 11 +- .../cp4d_service/tasks/wait/wait-couchdb.yml | 108 +++++++++++++++++ .../roles/mirror_case_prepare/tasks/main.yml | 96 +++++---------- .../tasks/uds-2010-fix.yml | 16 --- .../mirror_case_prepare/tasks/uds-208-fix.yml | 16 --- .../mirror_case_prepare/tasks/uds-209-fix.yml | 16 --- .../templates/uds2010fix/direct.txt.j2 | 15 --- .../uds2010fix/from-filesystem.txt.j2 | 15 --- .../templates/uds2010fix/to-filesystem.txt.j2 | 15 --- .../templates/uds208fix/direct.txt.j2 | 22 ---- .../uds208fix/from-filesystem.txt.j2 | 22 ---- .../templates/uds208fix/to-filesystem.txt.j2 | 22 ---- .../templates/uds209fix/direct.txt.j2 | 15 --- .../uds209fix/from-filesystem.txt.j2 | 15 --- .../templates/uds209fix/to-filesystem.txt.j2 | 15 --- .../roles/mirror_extras_prepare/README.md | 1 - .../vars/spark_3.3.4.yml | 16 +++ .../vars/spark_3.4.2.yml | 16 +++ .../mirror_extras_prepare/vars/uds_1.0.0.yml | 16 --- .../mirror_extras_prepare/vars/uds_1.1.0.yml | 11 -- .../mirror_extras_prepare/vars/uds_1.2.0.yml | 11 -- .../mirror_extras_prepare/vars/uds_1.3.0.yml | 11 -- .../mirror_extras_prepare/vars/uds_1.4.0.yml | 11 -- .../mirror_extras_prepare/vars/uds_1.5.0.yml | 11 -- ibm/mas_devops/roles/mirror_ocp/README.md | 11 +- .../templates/imagesetconfiguration.yml.j2 | 5 +- .../roles/ocp_contentsourcepolicy/README.md | 2 +- .../ocp_contentsourcepolicy/defaults/main.yml | 4 + .../ocp_contentsourcepolicy/tasks/main.yml | 6 + .../templates/imagecontentsourcepolicy.yml.j2 | 20 ++-- .../templates/redhat-catalogs.yml.j2 | 62 +++++----- .../templates/redhat-release.yml.j2 | 4 +- .../roles/ocp_provision/defaults/main.yml | 2 +- .../roles/ocp_provision/tasks/main.yml | 4 +- .../tasks/check_app_compatibility.yml | 2 +- .../roles/suite_app_upgrade/tasks/main.yml | 5 +- .../roles/suite_app_upgrade/tasks/upgrade.yml | 4 +- .../roles/suite_uninstall/tasks/main.yml | 2 +- .../roles/suite_upgrade/tasks/main.yml | 5 +- 55 files changed, 488 insertions(+), 438 deletions(-) create mode 100644 ibm/mas_devops/roles/cp4d/tasks/wait/wait-zenmetastore-edb.yml create mode 100644 ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-couchdb.yml delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-2010-fix.yml delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-208-fix.yml delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-209-fix.yml delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/direct.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/from-filesystem.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/to-filesystem.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/direct.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/from-filesystem.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/to-filesystem.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/direct.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/from-filesystem.txt.j2 delete mode 100644 ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/to-filesystem.txt.j2 create mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.3.4.yml create mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.4.2.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.0.0.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.1.0.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.2.0.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.3.0.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.4.0.yml delete mode 100644 ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.5.0.yml diff --git a/build/bin/build-collection.sh b/build/bin/build-collection.sh index b09fadd02..84a599cfb 100644 --- a/build/bin/build-collection.sh +++ b/build/bin/build-collection.sh @@ -13,8 +13,8 @@ cat $GITHUB_WORKSPACE/ibm/mas_devops/galaxy.yml # Update this when we have new catalog -MAS_PREVIOUS_CATALOG='v9-241003-amd64' -MAS_LATEST_CATALOG='v9-241107-amd64' +MAS_PREVIOUS_CATALOG='v9-241107-amd64' +MAS_LATEST_CATALOG='v9-241205-amd64' # Update all the placeholders in the playbooks diff --git a/docs/playbooks/ocp.md b/docs/playbooks/ocp.md index 5af2bfb6a..0efb9732e 100644 --- a/docs/playbooks/ocp.md +++ b/docs/playbooks/ocp.md @@ -16,7 +16,7 @@ export AWS_SECRET_ACCESS_KEY=xxx export ROSA_TOKEN=xxx export CLUSTER_NAME=masonrosa -export OCP_VERSION=4.15 +export OCP_VERSION=4.16 export ROSA_COMPUTE_NODES=5 export ROSA_CLUSTER_ADMIN_PASSWORD=xxx ansible-playbook ibm.mas_devops.ocp_rosa_provision @@ -31,7 +31,7 @@ This also supports upgrading the storage volume used for the cluster's internal ```bash export CLUSTER_NAME=masinst1 -export OCP_VERSION=4.15_openshift +export OCP_VERSION=4.16_openshift export IBMCLOUD_APIKEY=xxx export REBOOT_WORKER_NODES=true export CPD_ENTITLEMENT_KEY=xxx @@ -44,7 +44,7 @@ This playbook will provision a QuickBurn OCP cluster in IBM DevIT Fyre service, ```bash export CLUSTER_NAME=masinst1 -export OCP_VERSION=4.15 +export OCP_VERSION=4.16 export FYRE_USERNAME=xxx export FYRE_APIKEY=xxx export FYRE_PRODUCT_ID=xxx diff --git a/ibm/mas_devops/common_vars/compatibility_matrix.yml b/ibm/mas_devops/common_vars/compatibility_matrix.yml index 53365effd..b52044e90 100644 --- a/ibm/mas_devops/common_vars/compatibility_matrix.yml +++ b/ibm/mas_devops/common_vars/compatibility_matrix.yml @@ -1,5 +1,13 @@ --- compatibility_matrix: + 9.1.x-feature: + assist: [9.0.x] + iot: [9.0.x] + manage: [9.0.x, 9.1.x-feature] + monitor: [9.0.x] + optimizer: [9.0.x, 9.1.x-feature] + predict: [9.0.x] + visualinspection: [9.0.x, 9.1.x-feature] 9.0.x: assist: [8.8.x, 9.0.x] iot: [8.8.x, 9.0.x] @@ -39,6 +47,7 @@ compatibility_matrix: # There is probably a better way to do this by manipulating the channel string, but this is fast and cheap! upgrade_requirement: core: + 9.1.x-feature: 9.0.x 9.0.x: 8.11.x 8.11.x: 8.10.x 8.10.x: 8.9.x @@ -51,6 +60,7 @@ upgrade_requirement: 8.8.x: 8.7.x 8.7.x: 8.6.x manage: + 9.1.x-feature: 9.0.x 9.0.x: 8.7.x 8.7.x: 8.6.x 8.6.x: 8.5.x @@ -59,6 +69,7 @@ upgrade_requirement: 8.11.x: 8.10.x 8.10.x: 8.9.x optimizer: + 9.1.x-feature: 9.0.x 9.0.x: 8.5.x 8.5.x: 8.4.x 8.4.x: 8.3.x @@ -67,6 +78,7 @@ upgrade_requirement: 8.9.x: 8.8.x 8.8.x: 8.7.x visualinspection: + 9.1.x-feature: 9.0.x 9.0.x: 8.9.x 8.9.x: 8.8.x 8.8.x: 8.7.x @@ -74,6 +86,7 @@ upgrade_requirement: # There is probably a better way to do this by manipulating the channel string, but this is fast and cheap! upgrade_path: + 9.0.x: 9.1.x-feature 8.11.x: 9.0.x 8.10.x: 8.11.x 8.9.x: 8.10.x diff --git a/ibm/mas_devops/playbooks/mirror_add_assist.yml b/ibm/mas_devops/playbooks/mirror_add_assist.yml index d5a16cd9a..0459f39a0 100644 --- a/ibm/mas_devops/playbooks/mirror_add_assist.yml +++ b/ibm/mas_devops/playbooks/mirror_add_assist.yml @@ -24,20 +24,20 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-assist - case_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_catalog_metadata.mas_assist_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_catalog_metadata.mas_assist_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] ibmpak_skip_dependencies: false - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-assist - manifest_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_catalog_metadata.mas_assist_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_ASSIST_VERSION') | default (mas_catalog_metadata.mas_assist_version[mas_channel], True) | replace('_', '.') }}" # 2. IBM MAS Assist dependency from 9.0 - ibm-couchdb # ------------------------------------------------------------------------- - role: ibm.mas_devops.mirror_case_prepare when: - - couchdb_version is defined + - mas_catalog_metadata.couchdb_version is defined - mirror_mode != "from-filesystem" vars: case_name: ibm-couchdb @@ -46,7 +46,7 @@ ibmpak_skip_dependencies: false - role: ibm.mas_devops.mirror_images - when: couchdb_version is defined + when: mas_catalog_metadata.couchdb_version is defined vars: manifest_name: ibm-couchdb manifest_version: "{{ mas_catalog_metadata.couchdb_version }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_iot.yml b/ibm/mas_devops/playbooks/mirror_add_iot.yml index 11459a790..17cbd83a4 100644 --- a/ibm/mas_devops/playbooks/mirror_add_iot.yml +++ b/ibm/mas_devops/playbooks/mirror_add_iot.yml @@ -24,27 +24,27 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-iot - case_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_catalog_metadata.mas_iot_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_catalog_metadata.mas_iot_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-iot - manifest_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_catalog_metadata.mas_iot_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_IOT_VERSION') | default (mas_catalog_metadata.mas_iot_version[mas_channel], True) | replace('_', '.') }}" # 2. Eclipse Amlen # ------------------------------------------------------------------------- - role: ibm.mas_devops.mirror_extras_prepare when: - - amlen_extras_version is defined + - mas_catalog_metadata.amlen_extras_version is defined - mirror_mode != "from-filesystem" vars: extras_name: amlen extras_version: "{{ mas_catalog_metadata.amlen_extras_version }}" - role: ibm.mas_devops.mirror_images - when: amlen_extras_version is defined + when: mas_catalog_metadata.amlen_extras_version is defined vars: manifest_name: extras_amlen manifest_version: "{{ mas_catalog_metadata.amlen_extras_version }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_manage.yml b/ibm/mas_devops/playbooks/mirror_add_manage.yml index cb307155e..5c970bfeb 100644 --- a/ibm/mas_devops/playbooks/mirror_add_manage.yml +++ b/ibm/mas_devops/playbooks/mirror_add_manage.yml @@ -25,11 +25,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-manage - case_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_catalog_metadata.mas_manage_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_catalog_metadata.mas_manage_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] image_group_filter: "{{ (mirror_icd == 'true') | ternary ('ibmmasManage,ibmMasManage,ibmmasMaximoIT', 'ibmmasManage,ibmMasManage') }}" - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-manage - manifest_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_catalog_metadata.mas_manage_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_MANAGE_VERSION') | default (mas_catalog_metadata.mas_manage_version[mas_channel], True) | replace('_', '.') }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_monitor.yml b/ibm/mas_devops/playbooks/mirror_add_monitor.yml index c2655022d..3454e3a0c 100644 --- a/ibm/mas_devops/playbooks/mirror_add_monitor.yml +++ b/ibm/mas_devops/playbooks/mirror_add_monitor.yml @@ -24,13 +24,13 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-data-dictionary - case_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (mas_catalog_metadata.dd_version, True) }}" + case_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (mas_catalog_metadata.dd_version, True) | replace('_', '.') }}" exclude_images: [] - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-data-dictionary - manifest_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (mas_catalog_metadata.dd_version, True) }}" + manifest_version: "{{ lookup('env', 'DATA_DICTIONARY_VERSION') | default (mas_catalog_metadata.dd_version, True) | replace('_', '.') }}" # 2. IBM Maximo Monitor @@ -39,10 +39,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-monitor - case_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_catalog_metadata.mas_monitor_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_catalog_metadata.mas_monitor_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-monitor - manifest_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_catalog_metadata.mas_monitor_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_MONITOR_VERSION') | default (mas_catalog_metadata.mas_monitor_version[mas_channel], True) | replace('_', '.') }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_optimizer.yml b/ibm/mas_devops/playbooks/mirror_add_optimizer.yml index eaa51b043..00b5c64ca 100644 --- a/ibm/mas_devops/playbooks/mirror_add_optimizer.yml +++ b/ibm/mas_devops/playbooks/mirror_add_optimizer.yml @@ -24,10 +24,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-optimizer - case_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_catalog_metadata.mas_optimizer_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_catalog_metadata.mas_optimizer_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-optimizer - manifest_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_catalog_metadata.mas_optimizer_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_OPTIMIZER_VERSION') | default (mas_catalog_metadata.mas_optimizer_version[mas_channel], True) | replace('_', '.') }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_predict.yml b/ibm/mas_devops/playbooks/mirror_add_predict.yml index d9d7a53af..c94fcf1f9 100644 --- a/ibm/mas_devops/playbooks/mirror_add_predict.yml +++ b/ibm/mas_devops/playbooks/mirror_add_predict.yml @@ -24,11 +24,11 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-predict - case_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_catalog_metadata.mas_predict_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_catalog_metadata.mas_predict_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] ibmpak_skip_dependencies: false - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-predict - manifest_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_catalog_metadata.mas_predict_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_PREDICT_VERSION') | default (mas_catalog_metadata.mas_predict_version[mas_channel], True) | replace('_', '.') }}" diff --git a/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml b/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml index 6fadf429e..d4ed63486 100644 --- a/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml +++ b/ibm/mas_devops/playbooks/mirror_add_visualinspection.yml @@ -30,10 +30,10 @@ when: mirror_mode != "from-filesystem" vars: case_name: ibm-mas-visualinspection - case_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_catalog_metadata.mas_visualinspection_version[mas_channel], True) }}" + case_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_catalog_metadata.mas_visualinspection_version[mas_channel], True) | replace('_', '.') }}" exclude_images: [] - role: ibm.mas_devops.mirror_images vars: manifest_name: ibm-mas-visualinspection - manifest_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_catalog_metadata.mas_visualinspection_version[mas_channel], True) }}" + manifest_version: "{{ lookup('env', 'MAS_VISUALINSPECTION_VERSION') | default (mas_catalog_metadata.mas_visualinspection_version[mas_channel], True) | replace('_', '.') }}" diff --git a/ibm/mas_devops/playbooks/mirror_dependencies.yml b/ibm/mas_devops/playbooks/mirror_dependencies.yml index 3d009b7ef..55db54354 100644 --- a/ibm/mas_devops/playbooks/mirror_dependencies.yml +++ b/ibm/mas_devops/playbooks/mirror_dependencies.yml @@ -36,6 +36,7 @@ mirror_cp4d: "{{ lookup('env', 'MIRROR_CP4D') | default ('False', True) | bool }}" cpd_48_or_higher: "{{ cpd_product_version is defined and cpd_product_version is version('4.8.0','>=') | bool }}" cpd_48: "{{ cpd_product_version is defined and cpd_product_version is version('4.8.0','==') | bool }}" + cpd_50: "{{ cpd_product_version is defined and cpd_product_version is version('5.0.0','==') | bool }}" # 7. Watson Studio Local # ------------------------------------------------------------------------- @@ -227,7 +228,7 @@ # Mirroring another version for Cloud Pak Foundation Services - role: ibm.mas_devops.mirror_case_prepare when: - - mirror_common_svcs + - mirror_common_svcs or (cpd_48_or_higher and mirror_cp4d) - mirror_mode != "from-filesystem" - mas_catalog_metadata.common_svcs_version_1 is defined - mas_catalog_metadata.common_svcs_version_1 != "" @@ -244,13 +245,39 @@ - role: ibm.mas_devops.mirror_images when: - - mirror_common_svcs + - mirror_common_svcs or (cpd_48_or_higher and mirror_cp4d) - mas_catalog_metadata.common_svcs_version_1 is defined - mas_catalog_metadata.common_svcs_version_1 != "" vars: manifest_name: ibm-cp-common-services manifest_version: "{{ mas_catalog_metadata.common_svcs_version_1 }}" + - role: ibm.mas_devops.mirror_case_prepare + when: + - mirror_common_svcs or (cpd_48_or_higher and mirror_cp4d) + - mirror_mode != "from-filesystem" + - mas_catalog_metadata.common_svcs_version_2 is defined + - mas_catalog_metadata.common_svcs_version_2 != "" + vars: + case_name: ibm-cp-common-services + case_version: "{{ mas_catalog_metadata.common_svcs_version_2 }}" + exclude_images: + - ibm-auditlogging + - ibm-cpp + - ibm-cs-healthcheck + - ibm-cs-monitoring + - ibm-events-operator + ibmpak_skip_dependencies: false + + - role: ibm.mas_devops.mirror_images + when: + - mirror_common_svcs or (cpd_48_or_higher and mirror_cp4d) + - mas_catalog_metadata.common_svcs_version_1 is defined + - mas_catalog_metadata.common_svcs_version_1 != "" + vars: + manifest_name: ibm-cp-common-services + manifest_version: "{{ mas_catalog_metadata.common_svcs_version_2 }}" + # 4. IBM Suite License Service # ------------------------------------------------------------------------- @@ -311,6 +338,7 @@ extras_name: cp4d extras_version: "4.8.0" + - role: ibm.mas_devops.mirror_images when: - mirror_cp4d @@ -325,6 +353,40 @@ manifest_name: ibm-cp-datacore manifest_version: "{{ mas_catalog_metadata.cp4d_platform_version }}" + - role: ibm.mas_devops.mirror_extras_prepare + when: + - mirror_cp4d + - cpd_50 + - mirror_mode != "from-filesystem" + vars: + extras_name: spark + extras_version: "3.3.4" + + - role: ibm.mas_devops.mirror_images + when: + - mirror_cp4d + - cpd_50 + vars: + manifest_name: extras_spark + manifest_version: "3.3.4" + + - role: ibm.mas_devops.mirror_extras_prepare + when: + - mirror_cp4d + - cpd_50 + - mirror_mode != "from-filesystem" + vars: + extras_name: spark + extras_version: "3.4.2" + + - role: ibm.mas_devops.mirror_images + when: + - mirror_cp4d + - cpd_50 + vars: + manifest_name: extras_spark + manifest_version: "3.4.2" + # 6.2 CP4D Platform - IBM Licensing dependency # ------------------------------------------------------------------------- - role: ibm.mas_devops.mirror_case_prepare diff --git a/ibm/mas_devops/playbooks/ocp_fyre_provision.yml b/ibm/mas_devops/playbooks/ocp_fyre_provision.yml index 21efc2d7c..9a351e6b7 100644 --- a/ibm/mas_devops/playbooks/ocp_fyre_provision.yml +++ b/ibm/mas_devops/playbooks/ocp_fyre_provision.yml @@ -2,7 +2,7 @@ - hosts: localhost vars: cluster_type: fyre - ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.15', True) }}" + ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.16', True) }}" # We update the cipher support on all installs, even though it's only technically # requires for FIPS clusters diff --git a/ibm/mas_devops/playbooks/ocp_roks_provision.yml b/ibm/mas_devops/playbooks/ocp_roks_provision.yml index e3303d196..c6d0480f8 100644 --- a/ibm/mas_devops/playbooks/ocp_roks_provision.yml +++ b/ibm/mas_devops/playbooks/ocp_roks_provision.yml @@ -3,7 +3,7 @@ any_errors_fatal: true vars: cluster_type: roks - ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.15_openshift', True) }}" + ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.16_openshift', True) }}" prometheus_storage_class: ibmc-block-gold prometheus_alertmgr_storage_class: ibmc-file-gold-gid diff --git a/ibm/mas_devops/plugins/filter/filters.py b/ibm/mas_devops/plugins/filter/filters.py index bac70ec61..e2b7769d2 100644 --- a/ibm/mas_devops/plugins/filter/filters.py +++ b/ibm/mas_devops/plugins/filter/filters.py @@ -378,6 +378,16 @@ def format_pre_version_without_buildid(data): return data return data[:data.rfind("-")] +def format_pre_version_with_buildid(data): + """ + Versions in format 9.0.0-pre.stable-3757 cannot be used to compare with the version + reconciled by application operators, which is in format 9.0.0-pre.stable+3757. This function is to + format version to make it comparable + """ + if "pre" not in data or data.count("-") < 2: + return data + build_id_idx = data.rfind('-') + return f"{data[:build_id_idx]}{(data[build_id_idx:]).replace('-', '+')}" def get_db2_instance_name(binding_scope, mas_instance_id, mas_workspace_id, mas_application_id): if binding_scope == "": @@ -409,5 +419,6 @@ def filters(self): 'setSystemProperties': _setSystemProperties, 'format_pre_version_with_plus': format_pre_version_with_plus, 'format_pre_version_without_buildid': format_pre_version_without_buildid, + 'format_pre_version_with_buildid': format_pre_version_with_buildid, 'get_db2_instance_name': get_db2_instance_name } diff --git a/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml b/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml index 44e4fa78e..144b262a6 100644 --- a/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml +++ b/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml @@ -160,6 +160,15 @@ retries: 20 # Approximately 20 minutes before we give up delay: 60 # 1 minute +# 3-pre. Wait for Zen Metastore Cluster to be ready +# ----------------------------------------------------------------------------- +# There have been issues with Zen Metastore Cluster not starting due to Persistent Storage, +# This task restarts any failing pods +- name: "install-cp4d : Wait for zen-metadata to be ready again (60s delay)" + include_tasks: "tasks/wait/wait-zenmetastore-edb.yml" + when: + - cpd_48_or_higher + # 3. Wait for zenStatus # ----------------------------------------------------------------------------- # oc get ZenService lite-cr -o jsonpath="{.status.zenStatus}{'\n'}" diff --git a/ibm/mas_devops/roles/cp4d/tasks/wait/wait-zenmetastore-edb.yml b/ibm/mas_devops/roles/cp4d/tasks/wait/wait-zenmetastore-edb.yml new file mode 100644 index 000000000..22432104f --- /dev/null +++ b/ibm/mas_devops/roles/cp4d/tasks/wait/wait-zenmetastore-edb.yml @@ -0,0 +1,112 @@ +--- +# 1. Wait for zen metastore cluster to start +# ----------------------------------------------------------------------------- +- name: "wait-zenmetastore-edb : Wait for Zen Metastore EDB Cluster to be created" + k8s_info: + kind: Cluster + namespace: "{{ cpd_instance_namespace }}" + name: "zen-metastore-edb" + register: zenmetastoreCluster + retries: 120 # Give 60 minutes for the zenService to start Zen Metastore Pods (Logs show this taking ~20 minutes in a good run) + delay: 30 + until: zenmetastoreCluster.resources[0].status is defined + +# 2. For V4.8, We need to patch the postgres licensing job acccording to https://www.ibm.com/support/pages/node/7158524 +- name: "wait-zenmetastore-edb : Check and display the create-postgres-license-config license expiry date" + when: cpd_48 + block: + - name: "wait-zenmetastore-edb : Fetch the license expiry date" + kubernetes.core.k8s_info: + kind: Cluster + namespace: "{{ cpd_instance_namespace }}" + name: "zen-metastore-edb" + register: zenmetastoreCluster + until: + zenmetastoreCluster.resources[0].spec.instances is defined + and zenmetastoreCluster.resources[0].status.licenseStatus.licenseStatus is defined + retries: 40 # Give 20 minutes + delay: 30 + - debug: + msg: + - "License Expiration .. {{ zenmetastoreCluster.resources[0].status.licenseStatus.licenseExpiration | default ('') }}" + - "License Status ...... {{ zenmetastoreCluster.resources[0].status.licenseStatus.licenseStatus}}" + +- name: "wait-zenmetastore-edb : Update create-postgres-license-config job" + when: + - cpd_48 + - zenmetastoreCluster.resources[0].status.licenseStatus.licenseExpiration is not defined + block: + - name: "wait-zenmetastore-edb : Wait for create-postgres-license-config Job to be Completed or Failed (10s delay)" + kubernetes.core.k8s_info: + api_version: batch/v1 + kind: Job + name: "create-postgres-license-config" + namespace: "{{ cpd_operators_namespace }}" + register: _job_info + until: + - _job_info.resources is defined + - _job_info.resources | length > 0 + - (_job_info.resources | json_query('[*].status.conditions[?type==`Complete`][].status') | select ('match','True') | list | length == 1) or + (_job_info.resources | json_query('[*].status.conditions[?type==`Failed`][].status') | select ('match','True') | list | length == 1) + retries: 30 + delay: 10 + + - name: "wait-zenmetastore-edb : Recreate the job with up to date license image" + shell: >- + oc get job create-postgres-license-config -n {{ cpd_operators_namespace }} -o yaml | \ + sed -e 's/operator.ibm.com\/opreq-control: "true"/operator.ibm.com\/opreq-control: "false"/' \ + -e 's|\(image: \).*|\1"cp.icr.io/cp/cpd/edb-postgres-license-provider@sha256:c1670e7dd93c1e65a6659ece644e44aa5c2150809ac1089e2fd6be37dceae4ce"|' \ + -e '/controller-uid:/d' | \ + oc replace --force -f - + register: _job_recreate_output + + - debug: + msg: "Recreate the job: {{ _job_recreate_output }}" + + - name: "wait-zenmetastore-edb : Wait for create-postgres-license-config Job to be Completed or Failed (10s delay)" + kubernetes.core.k8s_info: + api_version: batch/v1 + kind: Job + name: "create-postgres-license-config" + namespace: "{{ cpd_operators_namespace }}" + register: _job_info + until: + - _job_info.resources is defined + - _job_info.resources | length > 0 + - (_job_info.resources | json_query('[*].status.conditions[?type==`Complete`][].status') | select ('match','True') | list | length == 1) or + (_job_info.resources | json_query('[*].status.conditions[?type==`Failed`][].status') | select ('match','True') | list | length == 1) + retries: 30 + delay: 10 + + - name: "wait-zenmetastore-edb : Check and display the license expiry date" + kubernetes.core.k8s_info: + kind: Cluster + namespace: "{{ cpd_instance_namespace }}" + name: "zen-metastore-edb" + register: newzenmetastoreCluster + until: + newzenmetastoreCluster.resources[0].spec.instances is defined + and newzenmetastoreCluster.resources[0].status.licenseStatus.licenseStatus is defined + and "Valid license" in newzenmetastoreCluster.resources[0].status.licenseStatus.licenseStatus + retries: 40 # Give 20 minutes + delay: 30 + + - debug: + msg: + - "License Expiration .. {{ newzenmetastoreCluster.resources[0].status.licenseStatus.licenseExpiration | default ('') }}" + - "License Status ...... {{ newzenmetastoreCluster.resources[0].status.licenseStatus.licenseStatus | default ('')}}" + +# 3. Wait for zen metastore replica pods to become ready +# ----------------------------------------------------------------------------- +- name: "wait-zenmetastore-edb : Wait for ZenMetastore pods to be become ready" + k8s_info: + kind: Cluster + namespace: "{{ cpd_instance_namespace }}" + name: "zen-metastore-edb" + register: zenmetastoreCluster + retries: 40 # Give 20 minutes for the pods to become ready + delay: 30 + until: >- + zenmetastoreCluster.resources[0].spec.instances is defined + and zenmetastoreCluster.resources[0].status.readyInstances is defined + and zenmetastoreCluster.resources[0].spec.instances == zenmetastoreCluster.resources[0].status.readyInstances diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml index f304fa5be..9645398c7 100644 --- a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml +++ b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml @@ -109,7 +109,16 @@ - cpd_48_or_higher # elastic search operator was just introduced with cpd 4.8 - not skip_ibm_entitlement_injection # eventually we hope to be able to skip patching the elastic search cr with image pull secret, but not for now -# 5. Wait for CCS CR to be ready +# 5. Wait for CouchDB Stateful Set to be ready +# ----------------------------------------------------------------------------- +# There have been issues with CouchDB not starting due to Persistent Storage, +# This task restarts any failing pods +- include_tasks: "tasks/wait/wait-couchdb.yml" + when: + - cpd_48 + + +# 6. Wait for CCS CR to be ready # ----------------------------------------------------------------------------- # Note: We can't fail early when we see Failed status, as the operator will # report failed multiple times during initial reconcile. diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-couchdb.yml b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-couchdb.yml new file mode 100644 index 000000000..8b7cf0939 --- /dev/null +++ b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-couchdb.yml @@ -0,0 +1,108 @@ +--- +# 1. Wait for couch-db stateful set to start all the replica pods +# ----------------------------------------------------------------------------- +- name: "wait-couchdb: Wait for CouchDB pods to be created" + k8s_info: + kind: StatefulSet + namespace: "{{ cpd_instance_namespace }}" + name: "wdp-couchdb" + register: couchdbStatefulSet + retries: 40 # Give 20 minutes for the ccs Operator to start CouchDB Pods (Logs show this taking ~7 minutes in a good run) + delay: 30 + until: >- + (( couchdbStatefulSet.resources[0].status is defined + and couchdbStatefulSet.resources[0].status.replicas is defined + and couchdbStatefulSet.resources[0].status.replicas == 0 ) + or ( couchdbStatefulSet.resources[0].status is defined + and couchdbStatefulSet.resources[0].status.updatedReplicas is defined + and couchdbStatefulSet.resources[0].status.replicas == couchdbStatefulSet.resources[0].status.updatedReplicas )) + + +# 2. Wait for couchdb replica pods to become ready +# ----------------------------------------------------------------------------- +- name: "wait-couchdb: Wait for CouchDB pods to be become ready" + k8s_info: + kind: StatefulSet + namespace: "{{ cpd_instance_namespace }}" + name: "wdp-couchdb" + register: couchdbStatefulSet + retries: 10 # Give 5 minutes for the pods to become ready + delay: 30 + until: >- + couchdbStatefulSet.resources[0].status.readyReplicas is defined + and couchdbStatefulSet.resources[0].status.replicas == couchdbStatefulSet.resources[0].status.readyReplicas + #ignore-errors: true # If this fails then we restart pending pods below + failed_when: false + +# 2. Restart any couchDB pods that are still Pending +# ----------------------------------------------------------------------------- +- set_fact: + is_couchdb_ready: true + when: + couchdbStatefulSet.resources[0].status.readyReplicas is defined + and couchdbStatefulSet.resources[0].status.replicas == couchdbStatefulSet.resources[0].status.readyReplicas + +- name: "wait-couchdb: Detecting and restarting pending CouchDB Pods" + block: + - name: "install-cp4d : Get pending CouchDB Pods" + kubernetes.core.k8s_info: + api_version: v1 + kind: Pod + label_selectors: + - "app=couchdb" + field_selectors: + - "status.phase=Pending" + namespace: "{{ cpd_instance_namespace }}" + register: pending_pod_lookup + + - set_fact: + pending_pod_names: "{{ pending_pod_lookup.resources | map(attribute='metadata.name') }}" + + - debug: + msg: "Restarting pending CouchDB Pods: {{ pending_pod_names }}" + + - name: "wait-couchdb: Restarting pending CouchDB Pods" + kubernetes.core.k8s: + state: absent + api_version: v1 + kind: Pod + namespace: "{{ cpd_instance_namespace }}" + name: "{{ item }}" + loop: "{{ pending_pod_names }}" + + # 3. Wait again couchdb replica pods to become ready + # ----------------------------------------------------------------------------- + - name: "wait-couchdb: Wait for CouchDB pods to be become ready" + k8s_info: + kind: StatefulSet + namespace: "{{ cpd_instance_namespace }}" + name: "wdp-couchdb" + register: couchdbStatefulSet + retries: 10 # Give another 5 minutes for the pods to become ready + delay: 30 + until: >- + couchdbStatefulSet.resources[0].status.readyReplicas is defined + and couchdbStatefulSet.resources[0].status.replicas == couchdbStatefulSet.resources[0].status.readyReplicas + failed_when: false # We handle and log the failure below. + + - name: "wait-couchdb: Fail if CouchDB pods are not ready" + block: + - name: "install-cp4d : Get Pending CouchDB Pods" + kubernetes.core.k8s_info: + api_version: v1 + kind: Pod + label_selectors: + - "app=couchdb" + field_selectors: + - "status.phase=Pending" + namespace: "{{ cpd_instance_namespace }}" + register: pending_pod_lookup + + - fail: + msg: + - "CouchDB pods are not ready {{ couchdbStatefulSet.resources[0].status }}" + - "Pending CouchDB Pods: {{ pending_pod_lookup.resources | map(attribute='metadata.name') }}" + when: + couchdbStatefulSet.resources[0].status.replicas != couchdbStatefulSet.resources[0].status.readyReplicas + + when: is_couchdb_ready is not defined diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml index 197fe4c3d..954888c63 100644 --- a/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml +++ b/ibm/mas_devops/roles/mirror_case_prepare/tasks/main.yml @@ -51,13 +51,15 @@ shell: oc ibm-pak get {{ case_name }} --version {{ case_version }} {{ ibmpak_flag_insecure }} {{ ibmpak_flag_skip_verify }} {{ ibmpak_flag_skip_dependencies }} register: ibmpak_get_result -# Team messed up the release and the version we will get back is 8.7.0+20230925.114420 rather than 8.7.0 -- name: "Workaround for ibm-mas-manage 8.7.0" - when: - - case_name == "ibm-mas-manage" - - case_version == "8.7.0" +- name: "{{ case_name }} : Get Build from output" set_fact: - case_version: "8.7.0+20230925.114420" + build_version: "{{ ibmpak_get_result.stdout | regex_search(regex,'\\1') | first }}" + vars: + regex: 'version: ([a-zA-Z0-9\+\.\-]*) is complete' + +- name: "{{ case_name }} : Debug build version" + debug: + var: build_version # 5. Remove excluded images # ----------------------------------------------------------------------------- @@ -66,38 +68,14 @@ when: - exclude_images is defined - exclude_images | length > 0 - shell: rm ~/.ibm-pak/data/cases/{{ case_name }}/{{ case_version }}/{{ item }}-*-images.csv + shell: rm ~/.ibm-pak/data/cases/{{ case_name }}/{{ build_version }}/{{ item }}-*-images.csv # We ignore errors, because if we can't delete something that isn't there it # doesn't really matter, e.g. removing ibm-mas-safety which isn't present since MAS v8.8 ignore_errors: true register: excludeImagesResult loop: "{{ exclude_images }}" -# 6. Generate mirror-manifest -# ----------------------------------------------------------------------------- -- name: Generate mirror-manifest with image group filter - block: - - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (direct)" - shell: "oc ibm-pak generate mirror-manifests {{ case_name }} {{ registry_public_url }} --version {{ case_version }} --filter {{ image_group_filter }}" - register: ibmpak_gen1_result - - - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (indirect)" - shell: "oc ibm-pak generate mirror-manifests {{ case_name }} file:// --version {{ case_version }} --final-registry {{ registry_public_url }} --filter {{ image_group_filter }}" - register: ibmpak_gen2_result - when: image_group_filter is defined - -- name: Generate mirror-manifest without image group filter - block: - - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (direct)" - shell: "oc ibm-pak generate mirror-manifests {{ case_name }} {{ registry_public_url }} --version {{ case_version }}" - register: ibmpak_gen1_result - - - name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (indirect)" - shell: "oc ibm-pak generate mirror-manifests {{ case_name }} file:// --version {{ case_version }} --final-registry {{ registry_public_url }}" - register: ibmpak_gen2_result - when: image_group_filter is not defined - -# 7. Collect generated files +# 6. Prepare for mirror-manifest # ----------------------------------------------------------------------------- - name: "{{ case_name }} : Create target directories (direct)" file: @@ -114,38 +92,37 @@ path: "{{ mirror_working_dir }}/manifests/from-filesystem" state: directory -# 8. Save the manifests to our working directory -# ----------------------------------------------------------------------------- -# Team messed up the release and the version we will get back is 8.7.0+20230925.114420 rather than 8.7.0 -# -# Note: We use _manifest_version to avoid conflict with manifest_version that is used as an input to -# the mirror_images role. If we set a manifest_version fact it will override the value passed into all -# mirror_image roles invoked in a playbook. - name: "Set manifest version" set_fact: _manifest_version: "{{ case_version }}" -- name: "Workaround for ibm-mas-manage 8.7.0" - when: - - case_name == "ibm-mas-manage" - - case_version == "8.7.0+20230925.114420" - set_fact: - _manifest_version: "8.7.0" +# 7. Generate mirror-manifest direct +# ----------------------------------------------------------------------------- +- name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (direct)" + shell: "oc ibm-pak generate mirror-manifests {{ case_name }} {{ registry_public_url }} --version {{ build_version }} {% if image_group_filter is defined %} --filter {{ image_group_filter }} {% endif %}" + register: ibmpak_gen1_result + +- name: "{{ case_name }} : Copy images-mapping" + ansible.builtin.copy: + src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ build_version }}/images-mapping.txt + dest: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ _manifest_version }}.txt" + +# 8. Generate mirror-manifest indirect +# ----------------------------------------------------------------------------- +- name: "{{ case_name }} : Generate the mirror manifest from the CASE bundle (indirect)" + shell: "oc ibm-pak generate mirror-manifests {{ case_name }} file:// --version {{ build_version }} --final-registry {{ registry_public_url }} {% if image_group_filter is defined %} --filter {{ image_group_filter }} {% endif %}" + register: ibmpak_gen2_result - name: "{{ case_name }} : Copy images-mapping-to-filesystem" ansible.builtin.copy: - src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ case_version }}/images-mapping-to-filesystem.txt + src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ build_version }}/images-mapping-to-filesystem.txt dest: "{{ mirror_working_dir }}/manifests/to-filesystem/{{ case_name }}_{{ _manifest_version }}.txt" - name: "{{ case_name }} : Copy images-mapping-from-filesystem" ansible.builtin.copy: - src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ case_version }}/images-mapping-from-filesystem.txt + src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ build_version }}/images-mapping-from-filesystem.txt dest: "{{ mirror_working_dir }}/manifests/from-filesystem/{{ case_name }}_{{ _manifest_version }}.txt" -- name: "{{ case_name }} : Copy images-mapping" - ansible.builtin.copy: - src: ~/.ibm-pak/data/mirror/{{ case_name }}/{{ case_version }}/images-mapping.txt - dest: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ _manifest_version }}.txt" # 9. IBM SLS 3.5.0 Bad Digest Hack # ----------------------------------------------------------------------------- @@ -154,23 +131,6 @@ when: case_name == "ibm-sls" and case_version == "3.5.0" include_tasks: "tasks/sls-350-fix.yml" -# 10. IBM UDS Entitled Image Hacks -# ----------------------------------------------------------------------------- -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.8 -- name: "IBM UDS 2.0.8 workaround" - when: case_name == "ibm-uds" and case_version == "2.0.8" - include_tasks: "tasks/uds-208-fix.yml" - -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.9 -- name: "IBM UDS 2.0.9 workaround" - when: case_name == "ibm-uds" and case_version == "2.0.9" - include_tasks: "tasks/uds-209-fix.yml" - -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.10 -- name: "IBM UDS 2.0.10 workaround" - when: case_name == "ibm-uds" and case_version == "2.0.10" - include_tasks: "tasks/uds-2010-fix.yml" - # 11. IBM Maximo IoT Hacks # ----------------------------------------------------------------------------- # The IoT CASE bundle for 8.6.0 has an incorrect image digest in it diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-2010-fix.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-2010-fix.yml deleted file mode 100644 index 43b0c358c..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-2010-fix.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# IBM UDS 2.0.10 Entitled Image Hack -# ----------------------------------------------------------------------------- -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.10 - -- template: - src: uds2010fix/direct.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds2010fix/to-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/to-filesystem/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds2010fix/from-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/from-filesystem/{{ case_name }}_{{ case_version }}.txt" diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-208-fix.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-208-fix.yml deleted file mode 100644 index 6191ba1d4..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-208-fix.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# IBM UDS 2.0.8 Entitled Image Hack -# ----------------------------------------------------------------------------- -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.8 - -- template: - src: uds208fix/direct.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds208fix/to-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/to-filesystem/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds208fix/from-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/from-filesystem/{{ case_name }}_{{ case_version }}.txt" diff --git a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-209-fix.yml b/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-209-fix.yml deleted file mode 100644 index 2c933425f..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/tasks/uds-209-fix.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# IBM UDS 2.0.9 Entitled Image Hack -# ----------------------------------------------------------------------------- -# The UDS CASE bundle includes one entitled image - cp/uds/uds-submodule:2.0.9 - -- template: - src: uds209fix/direct.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/direct/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds209fix/to-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/to-filesystem/{{ case_name }}_{{ case_version }}.txt" - -- template: - src: uds209fix/from-filesystem.txt.j2 - dest: "{{ mirror_working_dir }}/manifests/from-filesystem/{{ case_name }}_{{ case_version }}.txt" diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/direct.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/direct.txt.j2 deleted file mode 100644 index 5fd63fa6b..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/direct.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -icr.io/cpopen/ibm-uds/dataexchange-cli@sha256:bba1d98514a62eda85f7b7c9f23ec27f554583c054937aafa8ab2f881554974e={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-cli:2.0.10 -icr.io/cpopen/ibm-uds/dataexchange-service@sha256:2ca2511f02f77f2210ba6e2180c6f13d91faaf8641dbadc9629843e13de39fc7={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-service:2.0.10 -icr.io/cpopen/ibm-uds/event-api@sha256:c33a0059f26f6f57d7b1322c448a50af7345fa95151fb29a9bf20a7a72c6af74={{ registry_public_url }}/cpopen/ibm-uds/event-api:2.0.10 -icr.io/cpopen/ibm-uds/event-reader@sha256:27818819ad5dd0a187fa816b2c65c7673ae870af21fa55c781c9cf76b1d058fb={{ registry_public_url }}/cpopen/ibm-uds/event-reader:2.0.10 -icr.io/cpopen/ibm-uds/event-scheduler@sha256:eae226b96e904e4305670815b7ba2182c399b09e0b096e20bf75beab636f5ffe={{ registry_public_url }}/cpopen/ibm-uds/event-scheduler:2.0.10 -icr.io/cpopen/ibm-uds/store-api@sha256:d660de1e58024c1d3019a5041feb8cd26530fd258d36f4d4e834be80d19936e3={{ registry_public_url }}/cpopen/ibm-uds/store-api:2.0.10 -icr.io/cpopen/ibm-uds/uds-growth-stack-base@sha256:d13187798917f9d26cc530083e25cf1d16983073d182bf6d8e02b9097073a308={{ registry_public_url }}/cpopen/ibm-uds/uds-growth-stack-base:2.0.10 -icr.io/cpopen/ibm-user-data-services-catalog@sha256:f2fdd1c82563d183f69b02a28a3b1bf25052f942a6243c53e88a1c70d1351006={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.10 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:15b391fb854403e35c0858bbd8931311a86c67a977c0da2e07c3cf11fc5f489e={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.10 -icr.io/cpopen/ibm-user-data-services-operator@sha256:e01defa911a3027c770d873e4c92aa5f496b4fa38e600653fd189323777918a2={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.10 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f={{ registry_public_url }}/rhel8/postgresql-12:1-109 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/from-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/from-filesystem.txt.j2 deleted file mode 100644 index 79d2624a7..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/from-filesystem.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -file:///cpopen/ibm-uds/dataexchange-cli@sha256:bba1d98514a62eda85f7b7c9f23ec27f554583c054937aafa8ab2f881554974e={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-cli:2.0.10 -file:///cpopen/ibm-uds/dataexchange-service@sha256:2ca2511f02f77f2210ba6e2180c6f13d91faaf8641dbadc9629843e13de39fc7={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-service:2.0.10 -file:///cpopen/ibm-uds/event-api@sha256:c33a0059f26f6f57d7b1322c448a50af7345fa95151fb29a9bf20a7a72c6af74={{ registry_public_url }}/cpopen/ibm-uds/event-api:2.0.10 -file:///cpopen/ibm-uds/event-reader@sha256:27818819ad5dd0a187fa816b2c65c7673ae870af21fa55c781c9cf76b1d058fb={{ registry_public_url }}/cpopen/ibm-uds/event-reader:2.0.10 -file:///cpopen/ibm-uds/event-scheduler@sha256:eae226b96e904e4305670815b7ba2182c399b09e0b096e20bf75beab636f5ffe={{ registry_public_url }}/cpopen/ibm-uds/event-scheduler:2.0.10 -file:///cpopen/ibm-uds/store-api@sha256:d660de1e58024c1d3019a5041feb8cd26530fd258d36f4d4e834be80d19936e3={{ registry_public_url }}/cpopen/ibm-uds/store-api:2.0.10 -file:///cpopen/ibm-uds/uds-growth-stack-base@sha256:d13187798917f9d26cc530083e25cf1d16983073d182bf6d8e02b9097073a308={{ registry_public_url }}/cpopen/ibm-uds/uds-growth-stack-base:2.0.10 -file:///cpopen/ibm-user-data-services-catalog@sha256:f2fdd1c82563d183f69b02a28a3b1bf25052f942a6243c53e88a1c70d1351006={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.10 -file:///cpopen/ibm-user-data-services-operator-bundle@sha256:15b391fb854403e35c0858bbd8931311a86c67a977c0da2e07c3cf11fc5f489e={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.10 -file:///cpopen/ibm-user-data-services-operator@sha256:e01defa911a3027c770d873e4c92aa5f496b4fa38e600653fd189323777918a2={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.10 -file:///crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -file:///crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -file:///openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -file:///rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f={{ registry_public_url }}/rhel8/postgresql-12:1-109 -file:///ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/to-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/to-filesystem.txt.j2 deleted file mode 100644 index 5c4a854bc..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds2010fix/to-filesystem.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -icr.io/cpopen/ibm-uds/dataexchange-cli@sha256:bba1d98514a62eda85f7b7c9f23ec27f554583c054937aafa8ab2f881554974e=file:///cpopen/ibm-uds/dataexchange-cli:2.0.10 -icr.io/cpopen/ibm-uds/dataexchange-service@sha256:2ca2511f02f77f2210ba6e2180c6f13d91faaf8641dbadc9629843e13de39fc7=file:///cpopen/ibm-uds/dataexchange-service:2.0.10 -icr.io/cpopen/ibm-uds/event-api@sha256:c33a0059f26f6f57d7b1322c448a50af7345fa95151fb29a9bf20a7a72c6af74=file:///cpopen/ibm-uds/event-api:2.0.10 -icr.io/cpopen/ibm-uds/event-reader@sha256:27818819ad5dd0a187fa816b2c65c7673ae870af21fa55c781c9cf76b1d058fb=file:///cpopen/ibm-uds/event-reader:2.0.10 -icr.io/cpopen/ibm-uds/event-scheduler@sha256:eae226b96e904e4305670815b7ba2182c399b09e0b096e20bf75beab636f5ffe=file:///cpopen/ibm-uds/event-scheduler:2.0.10 -icr.io/cpopen/ibm-uds/store-api@sha256:d660de1e58024c1d3019a5041feb8cd26530fd258d36f4d4e834be80d19936e3=file:///cpopen/ibm-uds/store-api:2.0.10 -icr.io/cpopen/ibm-uds/uds-growth-stack-base@sha256:d13187798917f9d26cc530083e25cf1d16983073d182bf6d8e02b9097073a308=file:///cpopen/ibm-uds/uds-growth-stack-base:2.0.10 -icr.io/cpopen/ibm-user-data-services-catalog@sha256:f2fdd1c82563d183f69b02a28a3b1bf25052f942a6243c53e88a1c70d1351006=file:///cpopen/ibm-user-data-services-catalog:2.0.10 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:15b391fb854403e35c0858bbd8931311a86c67a977c0da2e07c3cf11fc5f489e=file:///cpopen/ibm-user-data-services-operator-bundle:2.0.10 -icr.io/cpopen/ibm-user-data-services-operator@sha256:e01defa911a3027c770d873e4c92aa5f496b4fa38e600653fd189323777918a2=file:///cpopen/ibm-user-data-services-operator:2.0.10 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b=file:///crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a=file:///crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f=file:///openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f=file:///rhel8/postgresql-12:1-109 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc=file:///ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/direct.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/direct.txt.j2 deleted file mode 100644 index c248c09e2..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/direct.txt.j2 +++ /dev/null @@ -1,22 +0,0 @@ -icr.io/cpopen/ibm-user-data-services-catalog@sha256:22d3fcbf6aa45cc14e194f66d042468c401667b6a35d141a75f9248c97c51c5a={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.8 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:ea3be336807dc12e66f9a8c01bc3bbbab8e98e4a4608721f8aadb54c99c0cd24={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.8 -icr.io/cpopen/ibm-user-data-services-operator@sha256:c8aebe926fd8de11ad84d5495f572e2c9db4e6fe81b0b383dbd0a63e49108067={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.8 -icr.io/ibm-uds/dataexchange-service@sha256:046a59acaadff8e072307ca7842fcb49cc618f226ae4fa22f28f9d419796025d={{ registry_public_url }}/ibm-uds/dataexchange-service:2.0.8 -icr.io/ibm-uds/event-api@sha256:b56db8f4730765336cfec3dd3ce6a7e2dd216a08406363806530c3c2a250c8aa={{ registry_public_url }}/ibm-uds/event-api:2.0.8 -icr.io/ibm-uds/event-reader@sha256:e933de8d98480fcd31e60cd9da8c43a3e351cb9fff2269846aeed1a57b7702d6={{ registry_public_url }}/ibm-uds/event-reader:2.0.8 -icr.io/ibm-uds/event-scheduler@sha256:c5468edaa03f3f4a5d9bb17ffe40cc41af0539bc4fcb1e0f7b5a243c99b7d06a={{ registry_public_url }}/ibm-uds/event-scheduler:2.0.8 -icr.io/ibm-uds/store-api@sha256:8d0e58ef20cb6b7b2fc6ada2a75944614b986629ee0a4750e7a2501b3b3e30d4={{ registry_public_url }}/ibm-uds/store-api:2.0.8 -icr.io/ibm-uds/uds-growth-stack-base@sha256:2495ac4ae49118da6912aba7af05b56f5f1c650eb8157e6b120343463168a367={{ registry_public_url }}/ibm-uds/uds-growth-stack-base:2.0.8 -registry.connect.redhat.com/crunchydata/crunchy-pgadmin4@sha256:581cd941d9becbe7fb0c0b11167f2a35b536cd73f9b236c8449344eb2c77bac5={{ registry_public_url }}/crunchydata/crunchy-pgadmin4:ubi8-4.30-0 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-pgbouncer@sha256:7cced75b5a800104a469d09300100a8d8d777bf164054273c7cba5cfa2be1e26={{ registry_public_url }}/crunchydata/crunchy-pgbouncer:ubi8-1.16-2 -registry.connect.redhat.com/crunchydata/crunchy-postgres-exporter@sha256:dbcfeb1d49a4776ea4dc55dea9d7f3ad8ea95aebab8bca38a15942429adce49c={{ registry_public_url }}/crunchydata/crunchy-postgres-exporter:ubi8-5.1.0-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:13bc18c31086037c159a7f4b661c12655193073824fc8a7dc2891e3d39d45fe9={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-13.6-3.0-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:e996679a8821f0fa537a579125664854256a94c73ff7cc2cface3edb85737920={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-14.2-3.1-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:f45e90e38f555cfce208bbace97a2abc473058839ffdd638c024432afafde8b2={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-13.6-3.1-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:5553680d6923f7517ab84181f073c92bb2b5a7acca8056f05ac61954b43b04d3={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-14.2-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.connect.redhat.com/crunchydata/postgres-operator@sha256:440375bdcb9a41807682336d593ad9231ba5b12ebda83db2d0d6b510f88195f1={{ registry_public_url }}/crunchydata/postgres-operator:ubi8-5.1.0-0 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f={{ registry_public_url }}/rhel8/postgresql-12:1-109 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/from-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/from-filesystem.txt.j2 deleted file mode 100644 index e1976601f..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/from-filesystem.txt.j2 +++ /dev/null @@ -1,22 +0,0 @@ -file:///cpopen/ibm-user-data-services-catalog@sha256:22d3fcbf6aa45cc14e194f66d042468c401667b6a35d141a75f9248c97c51c5a={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.8 -file:///cpopen/ibm-user-data-services-operator-bundle@sha256:ea3be336807dc12e66f9a8c01bc3bbbab8e98e4a4608721f8aadb54c99c0cd24={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.8 -file:///cpopen/ibm-user-data-services-operator@sha256:c8aebe926fd8de11ad84d5495f572e2c9db4e6fe81b0b383dbd0a63e49108067={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.8 -file:///crunchydata/crunchy-pgadmin4@sha256:581cd941d9becbe7fb0c0b11167f2a35b536cd73f9b236c8449344eb2c77bac5={{ registry_public_url }}/crunchydata/crunchy-pgadmin4:ubi8-4.30-0 -file:///crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -file:///crunchydata/crunchy-pgbouncer@sha256:7cced75b5a800104a469d09300100a8d8d777bf164054273c7cba5cfa2be1e26={{ registry_public_url }}/crunchydata/crunchy-pgbouncer:ubi8-1.16-2 -file:///crunchydata/crunchy-postgres-exporter@sha256:dbcfeb1d49a4776ea4dc55dea9d7f3ad8ea95aebab8bca38a15942429adce49c={{ registry_public_url }}/crunchydata/crunchy-postgres-exporter:ubi8-5.1.0-0 -file:///crunchydata/crunchy-postgres-gis@sha256:13bc18c31086037c159a7f4b661c12655193073824fc8a7dc2891e3d39d45fe9={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-13.6-3.0-1 -file:///crunchydata/crunchy-postgres-gis@sha256:e996679a8821f0fa537a579125664854256a94c73ff7cc2cface3edb85737920={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-14.2-3.1-1 -file:///crunchydata/crunchy-postgres-gis@sha256:f45e90e38f555cfce208bbace97a2abc473058839ffdd638c024432afafde8b2={{ registry_public_url }}/crunchydata/crunchy-postgres-gis:ubi8-13.6-3.1-1 -file:///crunchydata/crunchy-postgres@sha256:5553680d6923f7517ab84181f073c92bb2b5a7acca8056f05ac61954b43b04d3={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-14.2-1 -file:///crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -file:///crunchydata/postgres-operator@sha256:440375bdcb9a41807682336d593ad9231ba5b12ebda83db2d0d6b510f88195f1={{ registry_public_url }}/crunchydata/postgres-operator:ubi8-5.1.0-0 -file:///ibm-uds/dataexchange-service@sha256:046a59acaadff8e072307ca7842fcb49cc618f226ae4fa22f28f9d419796025d={{ registry_public_url }}/ibm-uds/dataexchange-service:2.0.8 -file:///ibm-uds/event-api@sha256:b56db8f4730765336cfec3dd3ce6a7e2dd216a08406363806530c3c2a250c8aa={{ registry_public_url }}/ibm-uds/event-api:2.0.8 -file:///ibm-uds/event-reader@sha256:e933de8d98480fcd31e60cd9da8c43a3e351cb9fff2269846aeed1a57b7702d6={{ registry_public_url }}/ibm-uds/event-reader:2.0.8 -file:///ibm-uds/event-scheduler@sha256:c5468edaa03f3f4a5d9bb17ffe40cc41af0539bc4fcb1e0f7b5a243c99b7d06a={{ registry_public_url }}/ibm-uds/event-scheduler:2.0.8 -file:///ibm-uds/store-api@sha256:8d0e58ef20cb6b7b2fc6ada2a75944614b986629ee0a4750e7a2501b3b3e30d4={{ registry_public_url }}/ibm-uds/store-api:2.0.8 -file:///ibm-uds/uds-growth-stack-base@sha256:2495ac4ae49118da6912aba7af05b56f5f1c650eb8157e6b120343463168a367={{ registry_public_url }}/ibm-uds/uds-growth-stack-base:2.0.8 -file:///openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -file:///rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f={{ registry_public_url }}/rhel8/postgresql-12:1-109 -file:///ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/to-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/to-filesystem.txt.j2 deleted file mode 100644 index 9326d16b6..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds208fix/to-filesystem.txt.j2 +++ /dev/null @@ -1,22 +0,0 @@ -icr.io/cpopen/ibm-user-data-services-catalog@sha256:22d3fcbf6aa45cc14e194f66d042468c401667b6a35d141a75f9248c97c51c5a=file:///cpopen/ibm-user-data-services-catalog:2.0.8 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:ea3be336807dc12e66f9a8c01bc3bbbab8e98e4a4608721f8aadb54c99c0cd24=file:///cpopen/ibm-user-data-services-operator-bundle:2.0.8 -icr.io/cpopen/ibm-user-data-services-operator@sha256:c8aebe926fd8de11ad84d5495f572e2c9db4e6fe81b0b383dbd0a63e49108067=file:///cpopen/ibm-user-data-services-operator:2.0.8 -icr.io/ibm-uds/dataexchange-service@sha256:046a59acaadff8e072307ca7842fcb49cc618f226ae4fa22f28f9d419796025d=file:///ibm-uds/dataexchange-service:2.0.8 -icr.io/ibm-uds/event-api@sha256:b56db8f4730765336cfec3dd3ce6a7e2dd216a08406363806530c3c2a250c8aa=file:///ibm-uds/event-api:2.0.8 -icr.io/ibm-uds/event-reader@sha256:e933de8d98480fcd31e60cd9da8c43a3e351cb9fff2269846aeed1a57b7702d6=file:///ibm-uds/event-reader:2.0.8 -icr.io/ibm-uds/event-scheduler@sha256:c5468edaa03f3f4a5d9bb17ffe40cc41af0539bc4fcb1e0f7b5a243c99b7d06a=file:///ibm-uds/event-scheduler:2.0.8 -icr.io/ibm-uds/store-api@sha256:8d0e58ef20cb6b7b2fc6ada2a75944614b986629ee0a4750e7a2501b3b3e30d4=file:///ibm-uds/store-api:2.0.8 -icr.io/ibm-uds/uds-growth-stack-base@sha256:2495ac4ae49118da6912aba7af05b56f5f1c650eb8157e6b120343463168a367=file:///ibm-uds/uds-growth-stack-base:2.0.8 -registry.connect.redhat.com/crunchydata/crunchy-pgadmin4@sha256:581cd941d9becbe7fb0c0b11167f2a35b536cd73f9b236c8449344eb2c77bac5=file:///crunchydata/crunchy-pgadmin4:ubi8-4.30-0 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b=file:///crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-pgbouncer@sha256:7cced75b5a800104a469d09300100a8d8d777bf164054273c7cba5cfa2be1e26=file:///crunchydata/crunchy-pgbouncer:ubi8-1.16-2 -registry.connect.redhat.com/crunchydata/crunchy-postgres-exporter@sha256:dbcfeb1d49a4776ea4dc55dea9d7f3ad8ea95aebab8bca38a15942429adce49c=file:///crunchydata/crunchy-postgres-exporter:ubi8-5.1.0-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:13bc18c31086037c159a7f4b661c12655193073824fc8a7dc2891e3d39d45fe9=file:///crunchydata/crunchy-postgres-gis:ubi8-13.6-3.0-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:e996679a8821f0fa537a579125664854256a94c73ff7cc2cface3edb85737920=file:///crunchydata/crunchy-postgres-gis:ubi8-14.2-3.1-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres-gis@sha256:f45e90e38f555cfce208bbace97a2abc473058839ffdd638c024432afafde8b2=file:///crunchydata/crunchy-postgres-gis:ubi8-13.6-3.1-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:5553680d6923f7517ab84181f073c92bb2b5a7acca8056f05ac61954b43b04d3=file:///crunchydata/crunchy-postgres:ubi8-14.2-1 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a=file:///crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.connect.redhat.com/crunchydata/postgres-operator@sha256:440375bdcb9a41807682336d593ad9231ba5b12ebda83db2d0d6b510f88195f1=file:///crunchydata/postgres-operator:ubi8-5.1.0-0 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f=file:///openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:fa920188f567e51d75aacd723f0964026e42ac060fed392036e8d4b3c7a8129f=file:///rhel8/postgresql-12:1-109 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc=file:///ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/direct.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/direct.txt.j2 deleted file mode 100644 index f5f76d50f..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/direct.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -icr.io/cpopen/ibm-uds/dataexchange-cli@sha256:c147871fc5913a54855e348db1fcea1c031cb8a59e25e09f6ae32ef23357d26b={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-cli:2.0.9 -icr.io/cpopen/ibm-uds/dataexchange-service@sha256:f7f113950c29da07c0ba74000be3483a80df07fc6334a22ce7abfbb005dbb23a={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-service:2.0.9 -icr.io/cpopen/ibm-uds/event-api@sha256:13c139e2d5dd3e06b298efdc428c7f61d5302c4fdbb672697b6ce78ae1a4af77={{ registry_public_url }}/cpopen/ibm-uds/event-api:2.0.9 -icr.io/cpopen/ibm-uds/event-reader@sha256:d8eb989b7af4bd5b6efe336535e65e4b9ab18ea4a8025d186f987ba949edb7e7={{ registry_public_url }}/cpopen/ibm-uds/event-reader:2.0.9 -icr.io/cpopen/ibm-uds/event-scheduler@sha256:899b5c907503caba65c035c112f0b492966244722f67bb7f0718b1b9821c356f={{ registry_public_url }}/cpopen/ibm-uds/event-scheduler:2.0.9 -icr.io/cpopen/ibm-uds/store-api@sha256:0f4c4dbe5c922d5c46a9f0159c69ca6018b12fcc1e494e3e7c9bf72c15993e51={{ registry_public_url }}/cpopen/ibm-uds/store-api:2.0.9 -icr.io/cpopen/ibm-uds/uds-growth-stack-base@sha256:231c92403d4711027c86ec29cef0fa23452d6c0b46d4a5ac9d269b0743430a06={{ registry_public_url }}/cpopen/ibm-uds/uds-growth-stack-base:2.0.9 -icr.io/cpopen/ibm-user-data-services-catalog@sha256:e54dafa673c43b8af138c5555ba7b6de74ba7ab50a903f4d3d4c67a9b72c5c30={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.9 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:3b96dcdad554efea6c3b0a65019d54a1df9065674c769d0ba0812853a22e63d3={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.9 -icr.io/cpopen/ibm-user-data-services-operator@sha256:ceb43a0e04d1ba8f87396af0a2012870af8b3f73e55c62e96335ec6fd79d0509={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.9 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:3d805540d777b09b4da6df99e7cddf9598d5ece4af9f6851721a9961df40f5a1={{ registry_public_url }}/rhel8/postgresql-12:1-130 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/from-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/from-filesystem.txt.j2 deleted file mode 100644 index 53f181716..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/from-filesystem.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -file:///cpopen/ibm-uds/dataexchange-cli@sha256:c147871fc5913a54855e348db1fcea1c031cb8a59e25e09f6ae32ef23357d26b={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-cli:2.0.9 -file:///cpopen/ibm-uds/dataexchange-service@sha256:f7f113950c29da07c0ba74000be3483a80df07fc6334a22ce7abfbb005dbb23a={{ registry_public_url }}/cpopen/ibm-uds/dataexchange-service:2.0.9 -file:///cpopen/ibm-uds/event-api@sha256:13c139e2d5dd3e06b298efdc428c7f61d5302c4fdbb672697b6ce78ae1a4af77={{ registry_public_url }}/cpopen/ibm-uds/event-api:2.0.9 -file:///cpopen/ibm-uds/event-reader@sha256:d8eb989b7af4bd5b6efe336535e65e4b9ab18ea4a8025d186f987ba949edb7e7={{ registry_public_url }}/cpopen/ibm-uds/event-reader:2.0.9 -file:///cpopen/ibm-uds/event-scheduler@sha256:899b5c907503caba65c035c112f0b492966244722f67bb7f0718b1b9821c356f={{ registry_public_url }}/cpopen/ibm-uds/event-scheduler:2.0.9 -file:///cpopen/ibm-uds/store-api@sha256:0f4c4dbe5c922d5c46a9f0159c69ca6018b12fcc1e494e3e7c9bf72c15993e51={{ registry_public_url }}/cpopen/ibm-uds/store-api:2.0.9 -file:///cpopen/ibm-uds/uds-growth-stack-base@sha256:231c92403d4711027c86ec29cef0fa23452d6c0b46d4a5ac9d269b0743430a06={{ registry_public_url }}/cpopen/ibm-uds/uds-growth-stack-base:2.0.9 -file:///cpopen/ibm-user-data-services-catalog@sha256:e54dafa673c43b8af138c5555ba7b6de74ba7ab50a903f4d3d4c67a9b72c5c30={{ registry_public_url }}/cpopen/ibm-user-data-services-catalog:2.0.9 -file:///cpopen/ibm-user-data-services-operator-bundle@sha256:3b96dcdad554efea6c3b0a65019d54a1df9065674c769d0ba0812853a22e63d3={{ registry_public_url }}/cpopen/ibm-user-data-services-operator-bundle:2.0.9 -file:///cpopen/ibm-user-data-services-operator@sha256:ceb43a0e04d1ba8f87396af0a2012870af8b3f73e55c62e96335ec6fd79d0509={{ registry_public_url }}/cpopen/ibm-user-data-services-operator:2.0.9 -file:///crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b={{ registry_public_url }}/crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -file:///crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a={{ registry_public_url }}/crunchydata/crunchy-postgres:ubi8-13.6-1 -file:///openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f={{ registry_public_url }}/openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -file:///rhel8/postgresql-12@sha256:3d805540d777b09b4da6df99e7cddf9598d5ece4af9f6851721a9961df40f5a1={{ registry_public_url }}/rhel8/postgresql-12:1-130 -file:///ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc={{ registry_public_url }}/ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/to-filesystem.txt.j2 b/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/to-filesystem.txt.j2 deleted file mode 100644 index b86839013..000000000 --- a/ibm/mas_devops/roles/mirror_case_prepare/templates/uds209fix/to-filesystem.txt.j2 +++ /dev/null @@ -1,15 +0,0 @@ -icr.io/cpopen/ibm-uds/dataexchange-cli@sha256:c147871fc5913a54855e348db1fcea1c031cb8a59e25e09f6ae32ef23357d26b=file:///cpopen/ibm-uds/dataexchange-cli:2.0.9 -icr.io/cpopen/ibm-uds/dataexchange-service@sha256:f7f113950c29da07c0ba74000be3483a80df07fc6334a22ce7abfbb005dbb23a=file:///cpopen/ibm-uds/dataexchange-service:2.0.9 -icr.io/cpopen/ibm-uds/event-api@sha256:13c139e2d5dd3e06b298efdc428c7f61d5302c4fdbb672697b6ce78ae1a4af77=file:///cpopen/ibm-uds/event-api:2.0.9 -icr.io/cpopen/ibm-uds/event-reader@sha256:d8eb989b7af4bd5b6efe336535e65e4b9ab18ea4a8025d186f987ba949edb7e7=file:///cpopen/ibm-uds/event-reader:2.0.9 -icr.io/cpopen/ibm-uds/event-scheduler@sha256:899b5c907503caba65c035c112f0b492966244722f67bb7f0718b1b9821c356f=file:///cpopen/ibm-uds/event-scheduler:2.0.9 -icr.io/cpopen/ibm-uds/store-api@sha256:0f4c4dbe5c922d5c46a9f0159c69ca6018b12fcc1e494e3e7c9bf72c15993e51=file:///cpopen/ibm-uds/store-api:2.0.9 -icr.io/cpopen/ibm-uds/uds-growth-stack-base@sha256:231c92403d4711027c86ec29cef0fa23452d6c0b46d4a5ac9d269b0743430a06=file:///cpopen/ibm-uds/uds-growth-stack-base:2.0.9 -icr.io/cpopen/ibm-user-data-services-catalog@sha256:e54dafa673c43b8af138c5555ba7b6de74ba7ab50a903f4d3d4c67a9b72c5c30=file:///cpopen/ibm-user-data-services-catalog:2.0.9 -icr.io/cpopen/ibm-user-data-services-operator-bundle@sha256:3b96dcdad554efea6c3b0a65019d54a1df9065674c769d0ba0812853a22e63d3=file:///cpopen/ibm-user-data-services-operator-bundle:2.0.9 -icr.io/cpopen/ibm-user-data-services-operator@sha256:ceb43a0e04d1ba8f87396af0a2012870af8b3f73e55c62e96335ec6fd79d0509=file:///cpopen/ibm-user-data-services-operator:2.0.9 -registry.connect.redhat.com/crunchydata/crunchy-pgbackrest@sha256:efe775d3208befb2b7f026ef5fee3b03b306a9ba773709ec5c4c3391880ee60b=file:///crunchydata/crunchy-pgbackrest:ubi8-2.38-0 -registry.connect.redhat.com/crunchydata/crunchy-postgres@sha256:6b570ee2922281eedc5c267c50ad30a895fbb4e8a132c3e2c3a38e29fe3d6f6a=file:///crunchydata/crunchy-postgres:ubi8-13.6-1 -registry.redhat.io/openshift4/ose-cli@sha256:ccc2d3d593bb4dab980b5483970eb441ede94bbe25972670b37d8890dce7f06f=file:///openshift4/ose-cli:v4.8.0-202205121606.p0.g41ff67e.assembly.stream -registry.redhat.io/rhel8/postgresql-12@sha256:3d805540d777b09b4da6df99e7cddf9598d5ece4af9f6851721a9961df40f5a1=file:///rhel8/postgresql-12:1-130 -registry.redhat.io/ubi8/nodejs-14@sha256:881e871f845b9395f5e21cfa45f0d1838dc9af60c4f18ece67bd56a9e44846cc=file:///ubi8/nodejs-14:1-75 diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/README.md b/ibm/mas_devops/roles/mirror_extras_prepare/README.md index 89b189f4c..4f0eacaff 100644 --- a/ibm/mas_devops/roles/mirror_extras_prepare/README.md +++ b/ibm/mas_devops/roles/mirror_extras_prepare/README.md @@ -10,7 +10,6 @@ Available Extras | catalog | N/A | Special extra package for mirroring the IBM Maximo Operator Catalog | | db2u | 1.0.0, 1.0.1 | Extra container images missing from the ibm-db2operator CASE bundle | | mongoce | 4.2.6, 4.2.23, 4.4.21 | Package containing all images required to use MongoCE Operator in the disconnected environment | -| uds | 1.0.0, 1.1.0, 1.2.0, 1.3.0 | Extra container images missing from the ibm-uds CASE bundle | | wd | 5.3.1 | Extra container images missing from the ibm-watson-discovery CASE bundle | | odf | 4.15 | Extra images needed for ODF 4.15 | diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.3.4.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.3.4.yml new file mode 100644 index 000000000..4b1ed0921 --- /dev/null +++ b/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.3.4.yml @@ -0,0 +1,16 @@ +--- +extra_images: + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.3.4.v51-amd64 + digest: sha256:8eac99b7c400192c540d066f61db156560ecdb4a6049de0333533f2505cda1a8 + + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.3.4.v51-s390x + digest: sha256:50ff80ba00aa5408a2fbfb1daea0726d21ae26082247fcf1770a7ff6b3ca8293 + + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.3.4.v51-ppc64le + digest: sha256:b31b6865dd6d30bbc1593d085f0663cf89181fb2ad12c833b2530f0ab65165db diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.4.2.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.4.2.yml new file mode 100644 index 000000000..300bb190b --- /dev/null +++ b/ibm/mas_devops/roles/mirror_extras_prepare/vars/spark_3.4.2.yml @@ -0,0 +1,16 @@ +--- +extra_images: + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.4.2.v51-amd64 + digest: sha256:805b3d92a86967e33b10f2b433dce7f75473402b3869800ca46acf374c91977a + + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.4.2.v51-s390x + digest: sha256:db1370a6582109343439b4910e6c4502834434c47fb6435972a095d2440ecd81 + + - name: cp/cpd/spark-hb-jkg + registry: cp.icr.io + tag: 3.4.2.v51-ppc64le + digest: sha256:92741f239b5d7024d160af0acd07cd4b75ffc31d4329bf2c962425f3ae8781dc diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.0.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.0.0.yml deleted file mode 100644 index 0664ec9a4..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.0.0.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.1.0 - registry: icr.io - tag: 4.2.0 - digest: sha256:359be5faff98968f1d59fc5e07fc50735003730643e81ea0f25dbc1ba6eac164 - - - name: cpopen/cpfs/ibm-events-kafka-3.2.0 - registry: icr.io - tag: 4.2.0 - digest: sha256:f960eace2e54e368516f5b17c18150ae92d6ef281c888d4c7f1c03a919e31ad2 - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.2.0 - digest: sha256:f10d8161e4fae49b2c9663d3fc38087462ed519c1c96a6d7b9e2990ec38afe1b diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.1.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.1.0.yml deleted file mode 100644 index 105b7989f..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.1.0.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.2.0 - registry: icr.io - tag: 4.2.1 - digest: sha256:6eab4c8aecb7d5d6a391d8ed9b79405d9199ded12474a18f76e8eb16426ea2ef - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.2.1 - digest: sha256:1ac2659319076b49cc7f659110f739224eedde45ceb3e61ad2ea97a63cc45225 diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.2.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.2.0.yml deleted file mode 100644 index d4de120a5..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.2.0.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.2.3 - registry: icr.io - tag: 4.4.0 - digest: sha256:1a40b470b6278d6d780eddd4d0196a8c10616455cd9025827677f30f87153f41 - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.4.0 - digest: sha256:fa35abd5c2a4e26f41682ac967329ed982ee915497971a1860df6f3663e305ca diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.3.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.3.0.yml deleted file mode 100644 index 25e518c33..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.3.0.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.4.0 - registry: icr.io - tag: 4.6.0 - digest: sha256:c0eb8c824343f7f8d9aafcb79984535e984410e568c236f8a7832a1811817fcf - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.6.0 - digest: sha256:b18c5d744843440226c3a2f43271edb78dfce06549b19fd1fbc65608b5928614 diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.4.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.4.0.yml deleted file mode 100644 index 7ec4edb2d..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.4.0.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.4.0 - registry: icr.io - tag: 4.6.1 - digest: sha256:c21d3b14267c7b4746adb8bad1fc2d8b3883973039dd304b59b1a066b13f1772 - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.6.1 - digest: sha256:39b72f2df66325ac5317a8a414c4f3fed27343081cbcd07252abc389e9330d84 diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.5.0.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.5.0.yml deleted file mode 100644 index 624a77601..000000000 --- a/ibm/mas_devops/roles/mirror_extras_prepare/vars/uds_1.5.0.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -extra_images: - - name: cpopen/cpfs/ibm-events-kafka-3.5.1 - registry: icr.io - tag: 4.9.0 - digest: sha256:4049092de0221944ffcc8764b7d61ae53773f00c90938127341afb08e6f3704d - - - name: cpopen/ibm-events-operator - registry: icr.io - tag: 4.9.0 - digest: sha256:815003818cc6c5e9303580fed35de26720f3aa4336c5e7e0e676eb2475c0f2af diff --git a/ibm/mas_devops/roles/mirror_ocp/README.md b/ibm/mas_devops/roles/mirror_ocp/README.md index 234ddb9c2..a85585139 100644 --- a/ibm/mas_devops/roles/mirror_ocp/README.md +++ b/ibm/mas_devops/roles/mirror_ocp/README.md @@ -11,11 +11,10 @@ Four actions are supported: Three **Catalogs** are mirrored, containing the following content: ### certified-operator-index -1. crunchy-postgres-operator (required by ibm.mas_devops.uds role) -2. gpu-operator-certified (required by ibm.mas_devops.nvidia_gpu role) -3. kubeturbo-certified (required by ibm.mas_devops.kubeturbo role) -4. ibm-metrics-operator (required by ibm.mas_devops.dro role) -5. ibm-data-reporter-operator (required by ibm.mas_devops.dro role) +1. gpu-operator-certified (required by ibm.mas_devops.nvidia_gpu role) +2. kubeturbo-certified (required by ibm.mas_devops.kubeturbo role) +3. ibm-metrics-operator (required by ibm.mas_devops.dro role) +4. ibm-data-reporter-operator (required by ibm.mas_devops.dro role) ### community-operator-index 1. grafana-operator (required by ibm.mas_devops.grafana role) @@ -157,7 +156,7 @@ Example Playbook mirror_redhat_platform: false mirror_redhat_operators: true - ocp_release: 4.15 + ocp_release: 4.16 redhat_pullsecret: ~/pull-secret.json roles: diff --git a/ibm/mas_devops/roles/mirror_ocp/templates/imagesetconfiguration.yml.j2 b/ibm/mas_devops/roles/mirror_ocp/templates/imagesetconfiguration.yml.j2 index 438e451ed..4e7ebaca4 100644 --- a/ibm/mas_devops/roles/mirror_ocp/templates/imagesetconfiguration.yml.j2 +++ b/ibm/mas_devops/roles/mirror_ocp/templates/imagesetconfiguration.yml.j2 @@ -21,9 +21,6 @@ mirror: # certified-operators - catalog: registry.redhat.io/redhat/certified-operator-index:v{{ ocp_release }} packages: - - name: crunchy-postgres-operator # Required by ibm.mas_devops.uds role - channels: - - name: v5 - name: gpu-operator-certified # Required by ibm.mas_devops.nvidia_gpu role channels: - name: v23.3 @@ -47,7 +44,9 @@ mirror: packages: - name: grafana-operator # Required by ibm.mas_devops.grafana role channels: +{% if ocp_release != "4.16" %} - name: v4 +{% endif %} - name: v5 - name: opentelemetry-operator # Required by ibm.mas_devops.opentelemetry role channels: diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/README.md b/ibm/mas_devops/roles/ocp_contentsourcepolicy/README.md index 866924b01..1074e4b92 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/README.md +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/README.md @@ -73,7 +73,7 @@ Instruct the role to setup **CatalogSources** and **ContentSourcePolicy** for th - Default: `False` ### ocp_release -The Red Hat release you are configuring an image content source policy for, e.g. `4.15`. +The Red Hat release you are configuring an image content source policy for, e.g. `4.16`. - **Required** if `setup_redhat_catalogs` is enabled (not required if only `setup_redhat_release` is used) - Environment Variable: `OCP_RELEASE` diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/defaults/main.yml b/ibm/mas_devops/roles/ocp_contentsourcepolicy/defaults/main.yml index 78106d6fe..eb4b5ef50 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/defaults/main.yml +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/defaults/main.yml @@ -24,3 +24,7 @@ artifactory_auth: "{{ artifactory_username }}:{{ artifactory_token }}" #Optional redhat catalog prefix settings env_redhat_catalogs_prefix: "{{ lookup('env', 'REDHAT_CATALOGS_PREFIX') | default('', true) }}" redhat_catalogs_prefix: "{% if env_redhat_catalogs_prefix|length > 0 %}{{ env_redhat_catalogs_prefix }}-{% endif %}" # If the prefix is not empty then add a dash + +#Optional redhat registry prefix settings +env_registry_prefix: "{{ lookup('env', 'REGISTRY_PREFIX') | default('', true) }}" +registry_prefix: "{% if env_registry_prefix|length > 0 %}{{ env_registry_prefix }}/{% endif %}" # If the prefix is not empty then add a slash diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/tasks/main.yml b/ibm/mas_devops/roles/ocp_contentsourcepolicy/tasks/main.yml index 89bf57e26..e9f94afa8 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/tasks/main.yml +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/tasks/main.yml @@ -13,6 +13,12 @@ - registry_private_port is defined and registry_private_port != "" - registry_private_ca_file is defined and registry_private_ca_file != "" +- name: "Settings" + debug: + msg: + - "Registry Private Host ..................... {{ registry_private_host }} " + - "Registry Private Port ..................... {{ registry_private_port }} " + - "Registry Prefix ........................... {{ registry_prefix }} " # 2. Configure CA trust # ----------------------------------------------------------------------------- diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 index 8ebd9cc68..fd662468f 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/imagecontentsourcepolicy.yml.j2 @@ -9,49 +9,49 @@ spec: # All IBM operators live in the cpopen namespace - source: icr.io/cpopen mirrors: - - {{ registry_private_url }}/cpopen + - {{ registry_private_url }}/{{ registry_prefix }}cpopen # IBM truststoremanager worker image lives in ibm-truststore-mgr namespace - source: icr.io/ibm-truststore-mgr mirrors: - - {{ registry_private_url }}/ibm-truststore-mgr + - {{ registry_private_url }}/{{ registry_prefix }}ibm-truststore-mgr # IBM SLS content live in ibm-sls namespace - source: icr.io/ibm-sls mirrors: - - {{ registry_private_url }}/ibm-sls + - {{ registry_private_url }}/{{ registry_prefix }}ibm-sls # IBM UDS content live in ibm-uds namespace - source: icr.io/ibm-uds mirrors: - - {{ registry_private_url }}/ibm-uds + - {{ registry_private_url }}/{{ registry_prefix }}ibm-uds # IBM Db2 Universal operator content live in db2u namespace - source: icr.io/db2u mirrors: - - {{ registry_private_url }}/db2u + - {{ registry_private_url }}/{{ registry_prefix }}db2u # 2. IBM Entitled Container Registry # ------------------------------------------------------------------------- # All IBM entitled container images live under cp namespace - source: cp.icr.io/cp mirrors: - - {{ registry_private_url }}/cp + - {{ registry_private_url }}/{{ registry_prefix }}cp # 3. Red Hat Quay.io Container Registry # ------------------------------------------------------------------------- # IBM common services live here - source: quay.io/opencloudio mirrors: - - {{ registry_private_url }}/opencloudio + - {{ registry_private_url }}/{{ registry_prefix }}opencloudio # MongoDb Community Edition Operator & associated container images - source: quay.io/mongodb mirrors: - - {{ registry_private_url }}/mongodb + - {{ registry_private_url }}/{{ registry_prefix }}mongodb # Eclipse Amlen - Message Broker for IoT/Mobile/Web. Mainly uses MQTT v3.x and v5. - source: quay.io/amlen mirrors: - - {{ registry_private_url }}/amlen + - {{ registry_private_url }}/{{ registry_prefix }}amlen # Non-product IBM Maximo Application Suite images (e.g. db2 backup operator & mirror of dockerhub mongodb image) - source: quay.io/ibmmas mirrors: - - {{ registry_private_url }}/ibmmas + - {{ registry_private_url }}/{{ registry_prefix }}ibmmas {% if artifactory_username != "" %} # 4. Artifactory diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-catalogs.yml.j2 b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-catalogs.yml.j2 index 8231e1cc6..8ea4e8d1f 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-catalogs.yml.j2 +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-catalogs.yml.j2 @@ -7,7 +7,7 @@ metadata: spec: displayName: Certified Operators publisher: Red Hat - image: {{ registry_private_url }}/redhat/{{ redhat_catalogs_prefix }}certified-operator-index:v{{ ocp_release }} + image: {{ registry_private_url }}/{{ registry_prefix}}redhat/certified-operator-index:v{{ ocp_release }} sourceType: grpc --- apiVersion: operators.coreos.com/v1alpha1 @@ -18,7 +18,7 @@ metadata: spec: displayName: Community Operators publisher: Red Hat - image: {{ registry_private_url }}/redhat/{{ redhat_catalogs_prefix }}community-operator-index:v{{ ocp_release }} + image: {{ registry_private_url }}/{{ registry_prefix }}redhat/community-operator-index:v{{ ocp_release }} sourceType: grpc --- apiVersion: operators.coreos.com/v1alpha1 @@ -29,7 +29,7 @@ metadata: spec: displayName: Red Hat Operators publisher: Red Hat - image: {{ registry_private_url }}/redhat/{{ redhat_catalogs_prefix }}redhat-operator-index:v{{ ocp_release }} + image: {{ registry_private_url }}/{{ registry_prefix }}redhat/redhat-operator-index:v{{ ocp_release }} sourceType: grpc --- apiVersion: operator.openshift.io/v1alpha1 @@ -41,87 +41,87 @@ metadata: spec: repositoryDigestMirrors: - mirrors: - - {{ registry_private_url }}/cpopen + - {{ registry_private_url }}/{{ registry_prefix }}cpopen source: icr.io/cpopen - mirrors: - - {{ registry_private_url }}/rhel8 + - {{ registry_private_url }}/{{ registry_prefix }}rhel8 source: registry.redhat.io/rhel8 - mirrors: - - {{ registry_private_url }}/rhel9 + - {{ registry_private_url }}/{{ registry_prefix }}rhel9 source: registry.redhat.io/rhel9 - mirrors: - - {{ registry_private_url }}/crunchydata + - {{ registry_private_url }}/{{ registry_prefix }}crunchydata source: registry.connect.redhat.com/crunchydata - mirrors: - - {{ registry_private_url }}/nvidia + - {{ registry_private_url }}/{{ registry_prefix }}nvidia source: registry.connect.redhat.com/nvidia - mirrors: - - {{ registry_private_url }}/grafana + - {{ registry_private_url }}/{{ registry_prefix }}grafana source: ghcr.io/grafana - mirrors: - - {{ registry_private_url }}/grafana + - {{ registry_private_url }}/{{ registry_prefix }}grafana source: docker.io/grafana - mirrors: # This is for the grafana v5 operator bundle image - - {{ registry_private_url }}/community-operator-pipeline-prod + - {{ registry_private_url }}/{{ registry_prefix }}community-operator-pipeline-prod source: quay.io/community-operator-pipeline-prod - mirrors: - - {{ registry_private_url }}/open-telemetry + - {{ registry_private_url }}/{{ registry_prefix }}open-telemetry source: ghcr.io/open-telemetry - mirrors: - - {{ registry_private_url }}/source-to-image + - {{ registry_private_url }}/{{ registry_prefix }}source-to-image source: registry.redhat.io/source-to-image - mirrors: - - {{ registry_private_url }}/odf4 + - {{ registry_private_url }}/{{ registry_prefix }}odf4 source: registry.redhat.io/odf4 - mirrors: - - {{ registry_private_url }}/operator-pipeline-prod + - {{ registry_private_url }}/{{ registry_prefix }}operator-pipeline-prod source: quay.io/operator-pipeline-prod - mirrors: - - {{ registry_private_url }}/strimzi + - {{ registry_private_url }}/{{ registry_prefix }}strimzi source: quay.io/strimzi - mirrors: - - {{ registry_private_url }}/rhceph + - {{ registry_private_url }}/{{ registry_prefix }}rhceph source: registry.redhat.io/rhceph - mirrors: - - {{ registry_private_url }}/amq-streams + - {{ registry_private_url }}/{{ registry_prefix }}amq-streams source: registry.redhat.io/amq-streams - mirrors: - - {{ registry_private_url }}/nvidia + - {{ registry_private_url }}/{{ registry_prefix }}nvidia source: nvcr.io/nvidia - mirrors: - - {{ registry_private_url }}/openshift4 + - {{ registry_private_url }}/{{ registry_prefix }}openshift4 source: registry.redhat.io/openshift4 - mirrors: - - {{ registry_private_url }}/openshift-community-operators + - {{ registry_private_url }}/{{ registry_prefix }}openshift-community-operators source: quay.io/openshift-community-operators - mirrors: - - {{ registry_private_url }}/kubebuilder + - {{ registry_private_url }}/{{ registry_prefix }}kubebuilder source: gcr.io/kubebuilder - mirrors: - - {{ registry_private_url }}/ubi8 + - {{ registry_private_url }}/{{ registry_prefix }}ubi8 source: registry.redhat.io/ubi8 - mirrors: - - {{ registry_private_url }}/ubi9 + - {{ registry_private_url }}/{{ registry_prefix }}ubi9 source: registry.redhat.io/ubi9 - mirrors: - - {{ registry_private_url }}/openshift-pipelines + - {{ registry_private_url }}/{{ registry_prefix }}openshift-pipelines source: registry.redhat.io/openshift-pipelines - mirrors: - - {{ registry_private_url }}/openshift-serverless-1 + - {{ registry_private_url }}/{{ registry_prefix }}openshift-serverless-1 source: registry.redhat.io/openshift-serverless-1 - mirrors: - - {{ registry_private_url }}/turbonomic + - {{ registry_private_url }}/{{ registry_prefix }}turbonomic source: registry.connect.redhat.com/turbonomic - mirrors: - - {{ registry_private_url }}/rh-marketplace + - {{ registry_private_url }}/{{ registry_prefix }}rh-marketplace source: quay.io/rh-marketplace - mirrors: - - {{ registry_private_url }}/rh-marketplace + - {{ registry_private_url }}/{{ registry_prefix }}rh-marketplace source: registry.connect.redhat.com/rh-marketplace - mirrors: - - {{ registry_private_url }}/cert-manager + - {{ registry_private_url }}/{{ registry_prefix }}cert-manager source: registry.redhat.io/cert-manager - mirrors: - - {{ registry_private_url }}/lvms4 + - {{ registry_private_url }}/{{ registry_prefix }}lvms4 source: registry.redhat.io/lvms4 diff --git a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-release.yml.j2 b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-release.yml.j2 index b36e13912..5ecd53aa2 100644 --- a/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-release.yml.j2 +++ b/ibm/mas_devops/roles/ocp_contentsourcepolicy/templates/redhat-release.yml.j2 @@ -5,8 +5,8 @@ metadata: spec: repositoryDigestMirrors: - mirrors: - - {{ registry_private_url }}/openshift/release + - {{ registry_private_url }}/{{ registry_prefix }}openshift/release source: quay.io/openshift-release-dev/ocp-v4.0-art-dev - mirrors: - - {{ registry_private_url }}/openshift/release-images + - {{ registry_private_url }}/{{ registry_prefix }}openshift/release-images source: quay.io/openshift-release-dev/ocp-release diff --git a/ibm/mas_devops/roles/ocp_provision/defaults/main.yml b/ibm/mas_devops/roles/ocp_provision/defaults/main.yml index be7c38fc8..af9053f46 100644 --- a/ibm/mas_devops/roles/ocp_provision/defaults/main.yml +++ b/ibm/mas_devops/roles/ocp_provision/defaults/main.yml @@ -7,7 +7,7 @@ cluster_platform: "{{lookup('env', 'CLUSTER_PLATFORM') | default('x',true)}}" ocp_version: "{{ lookup('env', 'OCP_VERSION') }}" ocp_fips_enabled: "{{ lookup('env', 'OCP_FIPS_ENABLED') | default('false', true) | bool }}" -default_ocp_version: 4.15 +default_ocp_version: 4.16 supported_cluster_types: - fyre diff --git a/ibm/mas_devops/roles/ocp_provision/tasks/main.yml b/ibm/mas_devops/roles/ocp_provision/tasks/main.yml index 288a907bd..47aaadb8f 100644 --- a/ibm/mas_devops/roles/ocp_provision/tasks/main.yml +++ b/ibm/mas_devops/roles/ocp_provision/tasks/main.yml @@ -34,8 +34,8 @@ Wednesday: 4.13 Thursday: 4.12 Friday: 4.15 - Saturday: 4.15 - Sunday: 4.15 + Saturday: 4.16 + Sunday: 4.16 - name: "Set default OCP version" when: ocp_version == "default" diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml index 85d2dbba6..b581f8360 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml @@ -11,7 +11,7 @@ - "Application Kind ....................... {{ app_info[mas_app_id].kind }}" - "Application CR Identifier .............. {{ mas_instance_id }}/{{ app_info[mas_app_id].kind }}.{{ app_info[mas_app_id].api_version }}" -- name: "{{ mas_app_id }} : Get subscription for ibm-mas" +- name: "{{ mas_app_id }} : Get subscription for {{ mas_app_fqn }}" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 name: "{{ mas_app_fqn }}" diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml index dac1ca291..755acadc9 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml @@ -17,9 +17,10 @@ when: mas_app_channel is not defined or mas_app_channel == "" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + namespace: "{{ mas_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas.{{ mas_namespace }}" register: core_sub_info diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml index 6998043fa..023e5e73b 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml @@ -58,9 +58,9 @@ # ----------------------------------------------------------------------------- # OperatorCondition names are in the format {packageName}.{packageVersion} # We want to strip off the "v" prefix from the version while we do this -- name: "upgrade : Lookup operator version for ibm-mas" +- name: "upgrade : Lookup operator version for {{ mas_app_fqn }}" set_fact: - updated_opcon_version: "{{ updated_opcon.resources[0].metadata.name.split('.v')[1] | ibm.mas_devops.format_pre_version_without_buildid }}" + updated_opcon_version: "{{ updated_opcon.resources[0].metadata.name.split('.v')[1] | ibm.mas_devops.format_pre_version_with_buildid }}" - name: "upgrade : Debug Operator Version" debug: diff --git a/ibm/mas_devops/roles/suite_uninstall/tasks/main.yml b/ibm/mas_devops/roles/suite_uninstall/tasks/main.yml index 181250bc0..88b633eea 100644 --- a/ibm/mas_devops/roles/suite_uninstall/tasks/main.yml +++ b/ibm/mas_devops/roles/suite_uninstall/tasks/main.yml @@ -153,7 +153,7 @@ kind: Subscription namespace: "mas-{{ mas_instance_id }}-core" label_selectors: - - "operators.coreos.com/ibm-mas.mas.mas-{{ mas_instance_id }}-core" + - "operators.coreos.com/ibm-mas.mas-{{ mas_instance_id }}-core" - name: "Delete ibm-truststore-mgr Subscription" kubernetes.core.k8s: diff --git a/ibm/mas_devops/roles/suite_upgrade/tasks/main.yml b/ibm/mas_devops/roles/suite_upgrade/tasks/main.yml index 0631ada51..77fce4e35 100644 --- a/ibm/mas_devops/roles/suite_upgrade/tasks/main.yml +++ b/ibm/mas_devops/roles/suite_upgrade/tasks/main.yml @@ -19,9 +19,10 @@ when: mas_channel is not defined or mas_channel == "" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + namespace: "{{ mas_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas.{{ mas_namespace }}" register: core_sub_info - name: "Set default upgrade target based on installed version of MAS core" From 15055193f00bbd6cd77f2dca747f7972b3e3982e Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 9 Dec 2024 14:30:52 +0000 Subject: [PATCH 15/25] [patch] merge with master --- ibm/mas_devops/roles/kmodels/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 3ac21b8d4..3e879806f 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,7 +2,7 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.2-pre.dev10x +mas_aibroker_controller_tag: 1.0.1 controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store mas_aibroker_store_tag: 1.0.1 From 7bdf09e4d69117c4c195f677e35102603e7c8958 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Wed, 11 Dec 2024 10:52:26 +0000 Subject: [PATCH 16/25] [patch] added dev version km components --- .../kmodels/templates/kmodels-controller/configmap.yml.j2 | 3 ++- ibm/mas_devops/roles/kmodels/vars/main.yml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 b/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 index d83c7e289..9a3905e36 100644 --- a/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 +++ b/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 @@ -15,5 +15,6 @@ data: PIPELINE_STEP_IMAGE_PREFIX: '' PIPELINE_DEFAULT_STEP_TAG: {{ mas_aibroker_pipeline_steps_tag }} CONNECTOR_DEFAULT_TAG: {{ mas_aibroker_connector_tag }} - DEFAULT_TENANTS: {{ tenantNamespace }} + # DEFAULT_TENANTS: {{ tenantNamespace }} PLATFORM: openshift + CONTROLLER_URL: "https://km-controller:8443" diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 3e879806f..301ad3c8a 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,13 +2,13 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.1 +mas_aibroker_controller_tag: 1.0.2-pre.dev10x controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store -mas_aibroker_store_tag: 1.0.1 +mas_aibroker_store_tag: 1.0.2-pre.dev10x store: "aibroker/store:{{ mas_aibroker_store_tag }}" # watcher -mas_aibroker_watcher_tag: 1.0.1 +mas_aibroker_watcher_tag: 1.0.2-pre.dev10x watcher: "aibroker/watcher:{{ mas_aibroker_watcher_tag }}" mas_aibroker_connector_tag: 1.0.0 From ad72a4cc5a305ccdecfba2cc36a8c45acb361b88 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Wed, 11 Dec 2024 14:24:17 +0000 Subject: [PATCH 17/25] [patch] update kmodels --- .../kmodels/templates/kmodels-controller/configmap.yml.j2 | 3 +-- .../roles/kmodels/templates/kmodels-watcher/configmap.yml.j2 | 2 +- .../roles/kmodels/templates/kmodels-watcher/deployment.yml.j2 | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 b/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 index 9a3905e36..d83c7e289 100644 --- a/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 +++ b/ibm/mas_devops/roles/kmodels/templates/kmodels-controller/configmap.yml.j2 @@ -15,6 +15,5 @@ data: PIPELINE_STEP_IMAGE_PREFIX: '' PIPELINE_DEFAULT_STEP_TAG: {{ mas_aibroker_pipeline_steps_tag }} CONNECTOR_DEFAULT_TAG: {{ mas_aibroker_connector_tag }} - # DEFAULT_TENANTS: {{ tenantNamespace }} + DEFAULT_TENANTS: {{ tenantNamespace }} PLATFORM: openshift - CONTROLLER_URL: "https://km-controller:8443" diff --git a/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/configmap.yml.j2 b/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/configmap.yml.j2 index 18349314d..aa049db5e 100644 --- a/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/configmap.yml.j2 +++ b/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/configmap.yml.j2 @@ -11,4 +11,4 @@ data: WATCHER_SENDER_DELAY: "5" EXCLUDE_JOB_NAMESPACES: "ibm-cpd" PIPELINES: mas-{{ mas_instance_id }}-aibroker - TENANTS: {{ tenantNamespace }} + CONTROLLER_URL: "https://km-controller:8443" \ No newline at end of file diff --git a/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/deployment.yml.j2 b/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/deployment.yml.j2 index fc5d80c6b..11e8cae8b 100644 --- a/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/deployment.yml.j2 +++ b/ibm/mas_devops/roles/kmodels/templates/kmodels-watcher/deployment.yml.j2 @@ -62,3 +62,5 @@ spec: envFrom: - configMapRef: name: km-watcher + - secretRef: + name: km-s3-secret \ No newline at end of file From a84433280c8b571c0d1263b8de0df6f423539025 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Thu, 12 Dec 2024 12:47:17 +0000 Subject: [PATCH 18/25] Squashed commit of the following: commit 1e91ba5f6361f484e67c1ab6181f399eebd4269c Author: Andrew Whitfield Date: Thu Dec 12 07:34:31 2024 +0000 [patch] Increase rosa deprovision wait time (#1592) --- ibm/mas_devops/roles/ocp_deprovision/tasks/providers/rosa.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm/mas_devops/roles/ocp_deprovision/tasks/providers/rosa.yml b/ibm/mas_devops/roles/ocp_deprovision/tasks/providers/rosa.yml index 075ce02a0..0f8a79b9c 100644 --- a/ibm/mas_devops/roles/ocp_deprovision/tasks/providers/rosa.yml +++ b/ibm/mas_devops/roles/ocp_deprovision/tasks/providers/rosa.yml @@ -73,8 +73,8 @@ shell: rosa describe cluster -c {{ cluster_name }} -o json register: cluster_lookup failed_when: "cluster_lookup.rc > 1" - retries: 60 - delay: 60 # 60s * 60 retries = 1 hour + retries: 90 + delay: 60 # 60s * 90 retries = 1.5 hours until: cluster_lookup.rc == 1 From 65d84b61556296addf1a20c593baf93a1d250cf4 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Fri, 13 Dec 2024 12:27:24 +0000 Subject: [PATCH 19/25] [patch] added maint10xdev versions for kmodels --- ibm/mas_devops/roles/kmodels/vars/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 301ad3c8a..77effddb0 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,13 +2,13 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.2-pre.dev10x +mas_aibroker_controller_tag: 1.0.2-pre.maint10xdev controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store -mas_aibroker_store_tag: 1.0.2-pre.dev10x +mas_aibroker_store_tag: 1.0.2-pre.maint10xdev store: "aibroker/store:{{ mas_aibroker_store_tag }}" # watcher -mas_aibroker_watcher_tag: 1.0.2-pre.dev10x +mas_aibroker_watcher_tag: 1.0.2-pre.maint10xdev watcher: "aibroker/watcher:{{ mas_aibroker_watcher_tag }}" mas_aibroker_connector_tag: 1.0.0 From a36f081591473d41b83a5b91bb0353270ca7e168 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Fri, 13 Dec 2024 16:15:39 +0000 Subject: [PATCH 20/25] [patch] add wx secret to tenant --- ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml index 3c59b8d99..fd42370a6 100644 --- a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml +++ b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml @@ -21,6 +21,7 @@ with_items: - km-s3-secret - '{{ pullSecretName }}' + - '{{ tenantNamespace }}'----wx-secret # Adding inference server runtimes - name: 'Create config map for connector config' From 6be8f6086f544040597224d22aceca9bd95ac005 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Fri, 13 Dec 2024 16:19:45 +0000 Subject: [PATCH 21/25] [patch] update secrets --- ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml index fd42370a6..54f03900c 100644 --- a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml +++ b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml @@ -21,7 +21,7 @@ with_items: - km-s3-secret - '{{ pullSecretName }}' - - '{{ tenantNamespace }}'----wx-secret + - '{{ tenantNamespace }}----wx-secret' # Adding inference server runtimes - name: 'Create config map for connector config' From 33734232bf4e202768297bde6e118b9e13b21e58 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 16 Dec 2024 13:00:24 +0000 Subject: [PATCH 22/25] [patch] add wx copy to tenant namespace --- .../roles/aibroker/tasks/watsonx/install/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ibm/mas_devops/roles/aibroker/tasks/watsonx/install/main.yml b/ibm/mas_devops/roles/aibroker/tasks/watsonx/install/main.yml index 3963bb1ba..633c3a409 100644 --- a/ibm/mas_devops/roles/aibroker/tasks/watsonx/install/main.yml +++ b/ibm/mas_devops/roles/aibroker/tasks/watsonx/install/main.yml @@ -11,3 +11,9 @@ script: "{{ role_path }}/files/create_wx.sh {{ tenantNamespace }} {{ aibroker_namespace }} {{ mas_aibroker_watsonxai_apikey }} {{ mas_aibroker_watsonxai_url }} {{ mas_aibroker_watsonxai_project_id }}" when: - wx_apikey_secret_info.resources | length == 0 + +# Copy wx secret to tenant namespace +- name: 'Copy secrets to namespace: {{ tenantNamespace }}' + shell: 'oc get secret {{ item }} -n mas-{{ mas_instance_id }}-aibroker -o yaml | sed "s/namespace: .*/namespace: {{ tenantNamespace }}/" | oc apply --force -f -' + with_items: + - '{{ tenantNamespace }}----wx-secret' From 3ee90431821ea6e98d4ea33b6578006235bacd12 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 16 Dec 2024 13:01:09 +0000 Subject: [PATCH 23/25] [patch] remove wx secret from tenant part --- ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml index 54f03900c..3c59b8d99 100644 --- a/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml +++ b/ibm/mas_devops/roles/aibroker/tasks/tenant/install/main.yml @@ -21,7 +21,6 @@ with_items: - km-s3-secret - '{{ pullSecretName }}' - - '{{ tenantNamespace }}----wx-secret' # Adding inference server runtimes - name: 'Create config map for connector config' From d5318dcfaa29463812c3c536945fca292d3854b1 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 16 Dec 2024 14:48:52 +0000 Subject: [PATCH 24/25] [patch] update kmodels components to version 1.0.2 --- ibm/mas_devops/roles/kmodels/vars/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ibm/mas_devops/roles/kmodels/vars/main.yml b/ibm/mas_devops/roles/kmodels/vars/main.yml index 77effddb0..a2ed6253b 100644 --- a/ibm/mas_devops/roles/kmodels/vars/main.yml +++ b/ibm/mas_devops/roles/kmodels/vars/main.yml @@ -2,13 +2,13 @@ # vars file for kmodels pullSecretName: "ibm-entitlement" # controller -mas_aibroker_controller_tag: 1.0.2-pre.maint10xdev +mas_aibroker_controller_tag: 1.0.2 controller: "aibroker/controller:{{ mas_aibroker_controller_tag }}" # store -mas_aibroker_store_tag: 1.0.2-pre.maint10xdev +mas_aibroker_store_tag: 1.0.2 store: "aibroker/store:{{ mas_aibroker_store_tag }}" # watcher -mas_aibroker_watcher_tag: 1.0.2-pre.maint10xdev +mas_aibroker_watcher_tag: 1.0.2 watcher: "aibroker/watcher:{{ mas_aibroker_watcher_tag }}" mas_aibroker_connector_tag: 1.0.0 From 057f830fd957308bc38a23f334bccdb27f7cd395 Mon Sep 17 00:00:00 2001 From: KAROL CZARNECKI Date: Mon, 16 Dec 2024 15:09:30 +0000 Subject: [PATCH 25/25] Squashed commit of the following: commit 49b2099ff65f2322fb8c670311dc5ea7030ae2ea Author: Rawa <61942902+rawa-resul@users.noreply.github.com> Date: Thu Dec 12 16:28:49 2024 +0000 [patch] Fix subscription lookup in upgrade (#1589) Co-authored-by: Rawa Resul commit 79c5991d608369f36eed2c50ea2edb69225b5ac7 Author: leo-miran <105313348+leo-miran@users.noreply.github.com> Date: Thu Dec 12 13:26:06 2024 -0300 [patch] fix default booleans for suite_dns (#1590) commit 1e91ba5f6361f484e67c1ab6181f399eebd4269c Author: Andrew Whitfield Date: Thu Dec 12 07:34:31 2024 +0000 [patch] Increase rosa deprovision wait time (#1592) --- ibm/mas_devops/roles/nvidia_gpu/tasks/main.yml | 1 - .../tasks/check_app_compatibility.yml | 9 ++++++--- .../tasks/check_core_compatibility.yml | 9 ++++++--- .../roles/suite_app_upgrade/tasks/main.yml | 5 +++-- .../roles/suite_app_upgrade/tasks/upgrade.yml | 8 ++++++-- ibm/mas_devops/roles/suite_dns/defaults/main.yaml | 10 +++++----- .../suite_upgrade/tasks/check_app_compatibility.yml | 9 ++++++--- .../suite_upgrade/tasks/check_core_compatibility.yml | 9 ++++++--- ibm/mas_devops/roles/suite_upgrade/tasks/upgrade.yml | 12 ++++++++---- 9 files changed, 46 insertions(+), 26 deletions(-) diff --git a/ibm/mas_devops/roles/nvidia_gpu/tasks/main.yml b/ibm/mas_devops/roles/nvidia_gpu/tasks/main.yml index 96b3f7d2a..598db8a3b 100644 --- a/ibm/mas_devops/roles/nvidia_gpu/tasks/main.yml +++ b/ibm/mas_devops/roles/nvidia_gpu/tasks/main.yml @@ -133,4 +133,3 @@ when: - gpu_clusterpolicy_result.resources | length == 0 - gpu_clusterpolicy_result.resources[0].status is not defined - diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml index b581f8360..174df9878 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_app_compatibility.yml @@ -14,9 +14,10 @@ - name: "{{ mas_app_id }} : Get subscription for {{ mas_app_fqn }}" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "{{ mas_app_fqn }}" - namespace: "{{ mas_app_namespace }}" kind: Subscription + namespace: "{{ mas_app_namespace }}" + label_selectors: + - "operators.coreos.com/{{ mas_app_fqn }}.{{ mas_app_namespace }}" register: app_sub_info - name: "{{ mas_app_id }} : Debug existing Subscription" @@ -46,7 +47,9 @@ fail_msg: "Unable to upgrade from {{ app_sub_info.resources[0].spec.channel }} to {{ mas_app_upgrade_target_channel }}" - name: "{{ mas_app_id }} : Check that install plan approvals are set to 'Automatic'" - when: app_sub_info.resources[0].spec.channel != mas_app_upgrade_target_channel + when: + - app_sub_info.resources[0].spec.channel != mas_app_upgrade_target_channel + - app_sub_info.resources[0].spec.installPlanApproval is defined assert: that: app_sub_info.resources[0].spec.installPlanApproval == 'Automatic' fail_msg: "Automatic install plan approvals must be enabled to upgrade via this role" diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_core_compatibility.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_core_compatibility.yml index 7065a46b6..871b3ade4 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_core_compatibility.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/check_core_compatibility.yml @@ -4,9 +4,10 @@ - name: "core : Get subscription for ibm-mas" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + namespace: "{{ mas_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas.{{ mas_namespace }}" register: core_sub_info - name: "core : Debug existing Subscription" @@ -22,7 +23,9 @@ fail_msg: "Unable to upgrade to {{ mas_app_upgrade_target_channel }} because {{ mas_app_fqn }} channel {{ mas_app_upgrade_target_channel }} is not supported with MAS Core {{ core_sub_info.resources[0].spec.channel }}. Supported application channels are: {{ compatibility_matrix[core_sub_info.resources[0].spec.channel][mas_app_id] }}" - name: "core : Check that install plan approvals are set to 'Automatic'" - when: core_sub_info.resources is defined and core_sub_info.resources | length == 1 + when: + - core_sub_info.resources is defined and core_sub_info.resources | length == 1 + - core_sub_info.resources[0].spec.installPlanApproval is defined assert: that: core_sub_info.resources[0].spec.installPlanApproval == 'Automatic' fail_msg: "Automatic install plan approvals must be enabled to upgrade via this role" diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml index 755acadc9..42daa0a99 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/main.yml @@ -47,9 +47,10 @@ - name: "{{ mas_app_id }} : Get subscription for {{ mas_app_fqn }}" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "{{ mas_app_fqn }}" - namespace: "{{ mas_app_namespace }}" kind: Subscription + namespace: "{{ mas_app_namespace }}" + label_selectors: + - "operators.coreos.com/{{ mas_app_fqn }}.{{ mas_app_namespace }}" register: app_sub_info diff --git a/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml b/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml index 023e5e73b..924687f25 100644 --- a/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml +++ b/ibm/mas_devops/roles/suite_app_upgrade/tasks/upgrade.yml @@ -5,9 +5,10 @@ - name: "Lookup subscription" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "{{ mas_app_fqn }}" - namespace: "{{ mas_app_namespace }}" kind: Subscription + namespace: "{{ mas_app_namespace }}" + label_selectors: + - "operators.coreos.com/{{ mas_app_fqn }}.{{ mas_app_namespace }}" register: suite_app_sub - name: "Assert subscription exists" @@ -25,6 +26,9 @@ definition: spec: channel: "{{ mas_app_upgrade_target_channel }}" + name: "{{ app_sub_info.resources[0].spec.name }}" + source: "{{ app_sub_info.resources[0].spec.source }}" + sourceNamespace: "{{ app_sub_info.resources[0].spec.sourceNamespace }}" apply: true - name: "Pause for 5 minutes before checking upgrade status..." diff --git a/ibm/mas_devops/roles/suite_dns/defaults/main.yaml b/ibm/mas_devops/roles/suite_dns/defaults/main.yaml index 50caf61ff..b589385b1 100644 --- a/ibm/mas_devops/roles/suite_dns/defaults/main.yaml +++ b/ibm/mas_devops/roles/suite_dns/defaults/main.yaml @@ -6,7 +6,7 @@ supported_dns_providers: - cis - cloudflare - route53 -mas_manual_cert_mgmt: "{{ lookup('env', 'MAS_MANUAL_CERT_MGMT')| default(False, true) }}" +mas_manual_cert_mgmt: "{{ lookup('env', 'MAS_MANUAL_CERT_MGMT')| default('false', true) | bool }}" # Certificate Manager # ----------------------------------------------------------------------------- @@ -50,7 +50,7 @@ cis_email: "{{ lookup('env', 'CIS_EMAIL') }}" cis_apikey: "{{ lookup('env', 'CIS_APIKEY') }}" cis_crn: "{{ lookup('env', 'CIS_CRN') }}" cis_subdomain: "{{ lookup('env', 'CIS_SUBDOMAIN') }}" -cis_enhanced_security: "{{ lookup('env', 'CIS_ENHANCED_SECURITY') | default(false, false) }}" +cis_enhanced_security: "{{ lookup('env', 'CIS_ENHANCED_SECURITY') | default('false', false) | bool }}" # Enhanced IBM CIS DNS Integration Security # ----------------------------------------------------------------------------- @@ -59,11 +59,11 @@ cis_proxy: "{{ lookup('env', 'CIS_PROXY') | default(false, true) }}" cis_service_name: "{{ lookup('env', 'CIS_SERVICE_NAME')}}" # Update DNS entry if it already exists -update_dns: "{{ lookup('env', 'UPDATE_DNS_ENTRIES') | default(true, true) }}" +update_dns: "{{ lookup('env', 'UPDATE_DNS_ENTRIES') | default('true', true) | bool }}" # Force deletion of wildcard dns entries in cis -delete_wildcards: "{{ lookup('env', 'DELETE_WILDCARDS') | default(false, true)}}" +delete_wildcards: "{{ lookup('env', 'DELETE_WILDCARDS') | default('false', true)| bool }}" # Override and delete any existing edge certificates in cis instance -override_edge_certs: "{{ lookup('env', 'OVERRIDE_EDGE_CERTS') | default(true, true)}}" +override_edge_certs: "{{ lookup('env', 'OVERRIDE_EDGE_CERTS') | default('true', true) | bool }}" cis_apiservice: group_name: acme.cis.ibm.com diff --git a/ibm/mas_devops/roles/suite_upgrade/tasks/check_app_compatibility.yml b/ibm/mas_devops/roles/suite_upgrade/tasks/check_app_compatibility.yml index ce78793fc..5a5fa3249 100644 --- a/ibm/mas_devops/roles/suite_upgrade/tasks/check_app_compatibility.yml +++ b/ibm/mas_devops/roles/suite_upgrade/tasks/check_app_compatibility.yml @@ -8,9 +8,10 @@ - name: "{{ check_app.id }} : Get subscription for ibm-mas-{{ check_app.id }}" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-{{ check_app.id }}" - namespace: "{{ check_app_namespace }}" kind: Subscription + namespace: "{{ check_app_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas-{{ check_app.id }}.{{ check_app_namespace }}" register: checkapp_sub_info - name: "{{ check_app.id }} : Debug existing Subscription" @@ -34,7 +35,9 @@ fail_msg: "Unable to upgrade to {{ mas_channel }} because ibm-mas-{{ check_app.id }} is subscribed to a channel that is not compatible with this release ({{ checkapp_sub_info.resources[0].spec.channel }}). Supported channels are: {{ compatibility_matrix[mas_channel][check_app.id] }}" - name: "{{ check_app.id }} : Check that install plan approvals are set to 'Automatic'" - when: checkapp_sub_info.resources is defined and checkapp_sub_info.resources | length == 1 + when: + - checkapp_sub_info.resources is defined and checkapp_sub_info.resources | length == 1 + - checkapp_sub_info.resources[0].spec.installPlanApproval is defined assert: that: checkapp_sub_info.resources[0].spec.installPlanApproval == 'Automatic' fail_msg: "Automatic install plan approvals must be enabled to upgrade via this role" diff --git a/ibm/mas_devops/roles/suite_upgrade/tasks/check_core_compatibility.yml b/ibm/mas_devops/roles/suite_upgrade/tasks/check_core_compatibility.yml index 7a2c2696b..22eb13a6e 100644 --- a/ibm/mas_devops/roles/suite_upgrade/tasks/check_core_compatibility.yml +++ b/ibm/mas_devops/roles/suite_upgrade/tasks/check_core_compatibility.yml @@ -4,9 +4,10 @@ - name: "core : Get subscription for ibm-mas" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + namespace: "{{ mas_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas.{{ mas_namespace }}" register: suite_sub_info - name: "core : Debug existing Subscription" @@ -36,7 +37,9 @@ fail_msg: "Unable to upgrade from {{ suite_sub_info.resources[0].spec.channel }} to {{ mas_channel }}" - name: "core : Check that install plan approvals are set to 'Automatic'" - when: suite_sub_info.resources[0].spec.channel != mas_channel + when: + - suite_sub_info.resources[0].spec.channel != mas_channel + - suite_sub_info.resources[0].spec.installPlanApproval is defined assert: that: suite_sub_info.resources[0].spec.installPlanApproval == 'Automatic' fail_msg: "Automatic install plan approvals must be enabled to upgrade via this role" diff --git a/ibm/mas_devops/roles/suite_upgrade/tasks/upgrade.yml b/ibm/mas_devops/roles/suite_upgrade/tasks/upgrade.yml index efa48eda8..0e4490689 100644 --- a/ibm/mas_devops/roles/suite_upgrade/tasks/upgrade.yml +++ b/ibm/mas_devops/roles/suite_upgrade/tasks/upgrade.yml @@ -4,12 +4,15 @@ - name: "upgrade : Update ibm-mas subscription channel" kubernetes.core.k8s: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + name: "{{ core_sub_info.resources[0].metadata.name }}" + namespace: "{{ mas_namespace }}" definition: spec: channel: "{{ mas_channel }}" + name: "{{ core_sub_info.resources[0].spec.name }}" + source: "{{ core_sub_info.resources[0].spec.source }}" + sourceNamespace: "{{ core_sub_info.resources[0].spec.sourceNamespace }}" apply: true @@ -18,9 +21,10 @@ - name: "upgrade : Get updated subscription for ibm-mas" kubernetes.core.k8s_info: api_version: operators.coreos.com/v1alpha1 - name: "ibm-mas-operator" - namespace: "{{ mas_namespace }}" kind: Subscription + namespace: "{{ mas_namespace }}" + label_selectors: + - "operators.coreos.com/ibm-mas.{{ mas_namespace }}" register: updated_suite_sub_info retries: 20 # about 10 minutes delay: 30 # seconds