Skip to content

Commit 0b053af

Browse files
committed
Add secrets for cluster-api
1 parent e4751c9 commit 0b053af

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ tests:
6868
env:
6969
ARCH: ppc64le
7070
BRANCH: master
71+
FEATURE_SET: TechPreviewNoUpgrade
7172
test:
7273
- as: test
7374
commands: openshift/e2e-tests.sh

ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.18.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ tests:
6969
env:
7070
ARCH: ppc64le
7171
BRANCH: "4.18"
72+
FEATURE_SET: TechPreviewNoUpgrade
7273
test:
7374
- as: test
7475
commands: openshift/e2e-tests.sh

ci-operator/config/openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-release-4.19.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ tests:
6868
env:
6969
ARCH: ppc64le
7070
BRANCH: "4.19"
71+
FEATURE_SET: TechPreviewNoUpgrade
7172
test:
7273
- as: test
7374
commands: openshift/e2e-tests.sh

ci-operator/step-registry/ipi/install/powervs/install/ipi-install-powervs-install-commands.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ IBMCLOUD_APIKEY_INGRESS_CREDS=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-c
754754
IBMCLOUD_APIKEY_MACHINEAPI_CREDS=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/IBMCLOUD_APIKEY_MACHINEAPI_CREDS")
755755
IBMCLOUD_APIKEY_CSI_CREDS=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/IBMCLOUD_APIKEY_CSI_CREDS")
756756
IBMCLOUD_REGISTRY_INSTALLER_CREDS=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/IBMCLOUD_REGISTRY_INSTALLER_CREDS")
757+
IBMCLOUD_CAPI_MANAGER_BOOTSTRAP_CREDS=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/IBMCLOUD_CAPI_MANAGER_BOOTSTRAP_CREDS")
757758
POWERVS_RESOURCE_GROUP=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/POWERVS_RESOURCE_GROUP")
758759
POWERVS_USER_ID=$(cat "/var/run/powervs-ipi-cicd-secrets/powervs-creds/POWERVS_USER_ID")
759760
POWERVS_SERVICE_INSTANCE_ID=$(yq-v4 eval '.POWERVS_SERVICE_INSTANCE_ID' "${SHARED_DIR}/powervs-conf.yaml")
@@ -908,6 +909,25 @@ stringData:
908909
type: Opaque
909910
EOF
910911

912+
if [ "${FEATURE_SET}" == "TechPreviewNoUpgrade" ]; then
913+
echo "Creating capi secrets" # REMOVE THIS LINE
914+
cat > "${dir}/manifests/openshift-cluster-api-capi-ibmcloud-manager-bootstrap-credentials.yaml" << EOF
915+
apiVersion: v1
916+
kind: Secret
917+
metadata:
918+
creationTimestamp: null
919+
name: capi-ibmcloud-manager-bootstrap-credentials
920+
namespace: openshift-cluster-api
921+
stringData:
922+
ibm-credentials.env: |-
923+
IBMCLOUD_AUTHTYPE=iam
924+
IBMCLOUD_APIKEY=${IBMCLOUD_CAPI_MANAGER_BOOTSTRAP_CREDS}
925+
ibmcloud_api_key: ${IBMCLOUD_CAPI_MANAGER_BOOTSTRAP_CREDS}
926+
type: Opaque
927+
EOF
928+
fi
929+
930+
911931
sed -i '/^ channel:/d' "${dir}/manifests/cvo-overrides.yaml"
912932

913933
echo "Will include manifests:"

0 commit comments

Comments
 (0)