WIP: IBM Cloud ROKS RDR changes

conf/deployment/ibmcloud/ibm_cloud_managed_3az_0m_3w_vpc_cluster.yaml

@@ -5,7 +5,7 @@ ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'eu-de'
-  zone: 'eu-de-3'
+  worker_availability_zone: 'eu-de-3'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -26,5 +26,6 @@ ENV_DATA:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster.yaml

@@ -5,7 +5,7 @@ ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'eu-de'
-  zone: 'eu-de-3'
+  worker_availability_zone: 'eu-de-3'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -24,5 +24,6 @@ ENV_DATA:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_hpcs_external.yaml

@@ -1,13 +1,11 @@
 
 # This is the basic config for IBM cloud usage with HPCS.
-DEPLOYMENT:
-  kms_deployment: true
 ---
 ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'eu-de'
-  zone: 'eu-de-3'
+  worker_availability_zone: 'eu-de-3'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -28,5 +26,7 @@ ENV_DATA:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  kms_deployment: true
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_stage.yaml

@@ -5,7 +5,7 @@ ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'us-south'
-  zone: 'us-south-1'
+  worker_availability_zone: 'us-south-1'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -23,5 +23,6 @@ AUTH:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_without_cos.yaml

@@ -1,13 +1,11 @@
 
 # This is the basic config for IBM cloud usage without COS secret created.
 ---
-DEPLOYMENT:
-  create_ibm_cos_secret: False
 ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'eu-de'
-  zone: 'eu-de-3'
+  worker_availability_zone: 'eu-de-3'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -24,5 +22,7 @@ ENV_DATA:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  create_ibm_cos_secret: False
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_without_cos_stage.yaml

@@ -2,13 +2,11 @@
 # This is the basic config for IBM cloud usage without COS secret created for
 # stage env.
 ---
-DEPLOYMENT:
-  create_ibm_cos_secret: False
 ENV_DATA:
   platform: 'ibm_cloud'
   deployment_type: 'managed'
   region: 'us-south'
-  zone: 'us-south-1'
+  worker_availability_zone: 'us-south-1'
   provider: "vpc-gen2"
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
@@ -26,5 +24,7 @@ AUTH:
 #    account_id: ACCOUNT ID PLACEHOLDER
 #    ibm_cos_access_key_id: KEY PLACEHOLDER
 #    ibm_cos_secret_access_key: SECRET PLACEHOLDER
-#DEPLOYMENT:
-#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER
+DEPLOYMENT:
+  create_ibm_cos_secret: False
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_eu_de_1.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'eu-de'
+  worker_availability_zone: 'eu-de-1'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'eu-de-1'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_eu_de_2.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'eu-de'
+  worker_availability_zone: 'eu-de-2'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'eu-de-2'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_eu_de_3.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'eu-de'
+  worker_availability_zone: 'eu-de-3'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'eu-de-3'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_jp_tok_1.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'jp-tok'
+  worker_availability_zone: 'jp-tok-1'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'jp-tok-1'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_jp_tok_2.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'jp-tok'
+  worker_availability_zone: 'jp-tok-2'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'jp-tok-2'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_jp_tok_3.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'jp-tok'
+  worker_availability_zone: 'jp-tok-3'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'jp-tok-3'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_us_east_1.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'us-east'
+  worker_availability_zone: 'us-east-1'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'us-east-1'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_us_east_2.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'us-east'
+  worker_availability_zone: 'us-east-2'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'us-east-2'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster_zone_us_east_3.yaml

@@ -0,0 +1,29 @@
+
+# This is the basic config for IBM cloud usage
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'us-east'
+  worker_availability_zone: 'us-east-3'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'us-east-3'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+DEPLOYMENT:
+  cnv_latest_stable: true
+  # ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER