From 0a22840c5e2e4568fc1f81a5d4f82023194ccd7e Mon Sep 17 00:00:00 2001 From: Bama Charan Kundu Date: Tue, 3 Dec 2024 22:19:45 +0530 Subject: [PATCH] Added IBM arch for OCP-ART cluster (#5037) Signed-off-by: Bama Charan Kundu --- .../kflux-ocp-p01/host-config.yaml | 32 +++++++++---------- .../kflux-ocp-p01/ibm-account.patch.yaml | 4 +++ .../kflux-ocp-p01/ibm-ssh-key.patch.yaml | 4 +++ .../kflux-ocp-p01/kustomization.yaml | 8 +++++ 4 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-account.patch.yaml create mode 100644 components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-ssh-key.patch.yaml diff --git a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/host-config.yaml b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/host-config.yaml index 93efa46f604..214d1b2ae5b 100644 --- a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/host-config.yaml +++ b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/host-config.yaml @@ -390,10 +390,10 @@ data: dynamic.linux-s390x.secret: "internal-prod-ibm-api-key" dynamic.linux-s390x.vpc: "konflux-internal-prod-us-east-1" dynamic.linux-s390x.key: "internal-prod-key" - dynamic.linux-s390x.subnet: "internal-a" - dynamic.linux-s390x.image-id: "r014-23be9e67-4ab2-4dc9-9a51-d56efb06943d" - dynamic.linux-s390x.region: "us-east-1" - dynamic.linux-s390x.url: "https://us-east.iaas.cloud.ibm.com/v1" + dynamic.linux-s390x.subnet: "konflux-internal-ocp-art-vpc-subnet" + dynamic.linux-s390x.image-id: "r006-7af05e6b-b1cd-4467-8a37-770ce2094e8d" + dynamic.linux-s390x.region: "us-south-2" + dynamic.linux-s390x.url: "https://us-south.iaas.cloud.ibm.com/v1" dynamic.linux-s390x.profile: "bz2-2x8" dynamic.linux-s390x.max-instances: "50" dynamic.linux-s390x.private-ip: "true" @@ -405,10 +405,10 @@ data: dynamic.linux-large-s390x.secret: "internal-prod-ibm-api-key" dynamic.linux-large-s390x.vpc: "konflux-internal-prod-us-east-1" dynamic.linux-large-s390x.key: "internal-prod-key" - dynamic.linux-large-s390x.subnet: "internal-a" - dynamic.linux-large-s390x.image-id: "r014-23be9e67-4ab2-4dc9-9a51-d56efb06943d" - dynamic.linux-large-s390x.region: "us-east-1" - dynamic.linux-large-s390x.url: "https://us-east.iaas.cloud.ibm.com/v1" + dynamic.linux-large-s390x.subnet: "konflux-internal-ocp-art-vpc-subnet" + dynamic.linux-large-s390x.image-id: "r006-7af05e6b-b1cd-4467-8a37-770ce2094e8d" + dynamic.linux-large-s390x.region: "us-south-2" + dynamic.linux-large-s390x.url: "https://us-south.iaas.cloud.ibm.com/v1" dynamic.linux-large-s390x.profile: "bz2-4x16" dynamic.linux-large-s390x.max-instances: "50" dynamic.linux-large-s390x.private-ip: "true" @@ -419,10 +419,10 @@ data: dynamic.linux-ppc64le.ssh-secret: "internal-prod-ibm-ssh-key" dynamic.linux-ppc64le.secret: "internal-prod-ibm-api-key" dynamic.linux-ppc64le.key: "prod-konflux-infra" - dynamic.linux-ppc64le.image: "konflux-internal-prod-ppc-base-oct-04-24" - dynamic.linux-ppc64le.crn: "crn:v1:bluemix:public:power-iaas:wdc06:a/5cb0704ee6304413bd0b171372c0fd77:4e9dc638-7a78-4e7c-b432-e83b7010c531::" - dynamic.linux-ppc64le.url: "https://us-east.power-iaas.cloud.ibm.com" - dynamic.linux-ppc64le.network: "a6d8d6da-c412-4106-9b57-4e25541b2e7f" + dynamic.linux-ppc64le.image: "ppc64le-rhel-94-base-27nov2024" + dynamic.linux-ppc64le.crn: "crn:v1:bluemix:public:power-iaas:dal12:a/eebc7153d0c844f9915fb6f3b9850a3b:d6faf373-c0b6-4ba9-b0bc-4f7e0a74f9d5::" + dynamic.linux-ppc64le.url: "https://us-south.power-iaas.cloud.ibm.com" + dynamic.linux-ppc64le.network: "4d164943-b043-4c6e-bba5-d233abf66c6a" dynamic.linux-ppc64le.system: "e980" dynamic.linux-ppc64le.cores: "2" dynamic.linux-ppc64le.memory: "8" @@ -434,10 +434,10 @@ data: dynamic.linux-large-ppc64le.ssh-secret: "internal-prod-ibm-ssh-key" dynamic.linux-large-ppc64le.secret: "internal-prod-ibm-api-key" dynamic.linux-large-ppc64le.key: "prod-konflux-infra" - dynamic.linux-large-ppc64le.image: "konflux-internal-prod-ppc-base-oct-04-24" - dynamic.linux-large-ppc64le.crn: "crn:v1:bluemix:public:power-iaas:wdc06:a/5cb0704ee6304413bd0b171372c0fd77:4e9dc638-7a78-4e7c-b432-e83b7010c531::" - dynamic.linux-large-ppc64le.url: "https://us-east.power-iaas.cloud.ibm.com" - dynamic.linux-large-ppc64le.network: "a6d8d6da-c412-4106-9b57-4e25541b2e7f" + dynamic.linux-large-ppc64le.image: "ppc64le-rhel-94-base-27nov2024" + dynamic.linux-large-ppc64le.crn: "crn:v1:bluemix:public:power-iaas:dal12:a/eebc7153d0c844f9915fb6f3b9850a3b:d6faf373-c0b6-4ba9-b0bc-4f7e0a74f9d5::" + dynamic.linux-large-ppc64le.url: "https://us-south.power-iaas.cloud.ibm.com" + dynamic.linux-large-ppc64le.network: "4d164943-b043-4c6e-bba5-d233abf66c6a" dynamic.linux-large-ppc64le.system: "e980" dynamic.linux-large-ppc64le.cores: "4" dynamic.linux-large-ppc64le.memory: "16" diff --git a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-account.patch.yaml b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-account.patch.yaml new file mode 100644 index 00000000000..dda0b8a76bf --- /dev/null +++ b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-account.patch.yaml @@ -0,0 +1,4 @@ +--- +- op: replace + path: /spec/dataFrom/0/extract/key + value: production/build/multi-platform-controller/kflux-ocp-p01-ibm-api-key diff --git a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-ssh-key.patch.yaml b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-ssh-key.patch.yaml new file mode 100644 index 00000000000..0b5684dbd9f --- /dev/null +++ b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/ibm-ssh-key.patch.yaml @@ -0,0 +1,4 @@ +--- +- op: replace + path: /spec/dataFrom/0/extract/key + value: production/build/multi-platform-controller/kflux-ocp-p01-ibm-ssh-key diff --git a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/kustomization.yaml b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/kustomization.yaml index 5ca92f13d30..fd7b45d3cca 100644 --- a/components/multi-platform-controller/production-downstream/kflux-ocp-p01/kustomization.yaml +++ b/components/multi-platform-controller/production-downstream/kflux-ocp-p01/kustomization.yaml @@ -14,3 +14,11 @@ patches: target: kind: ExternalSecret name: aws-ssh-key +- path: ibm-account.patch.yaml + target: + kind: ExternalSecret + name: internal-prod-ibm-api-key +- path: ibm-ssh-key.patch.yaml + target: + kind: ExternalSecret + name: internal-prod-ibm-ssh-key