From e1d4809e496c2f5674cb884ada5c8a5f68cc0d89 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Mon, 22 Jun 2026 16:38:10 +0100 Subject: [PATCH] Fix bootstrap failure in openshift-e2e-aws-disconnected aws-provision-cco-manual-users-static was incorrectly filtering CredentialRequest manifests, resulting in attempting to create a CR secret in a namespace which was not created in the cluster. oc adm release extract --included is the modern solution to this. --- .../openshift-cluster-capi-operator-main.yaml | 1 + .../openshift-cluster-capi-operator-release-4.23.yaml | 1 + .../openshift-cluster-capi-operator-release-5.0.yaml | 1 + .../openshift-cluster-capi-operator-release-5.1.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml index 4359af4cccdc5..c9d71a3368c21 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml @@ -138,6 +138,7 @@ tests: cluster_profile: openshift-org-aws env: ENABLE_IDMS: "yes" + EXTRACT_MANIFEST_INCLUDED: "true" FEATURE_SET: TechPreviewNoUpgrade observers: enable: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml index 75d8e80b3af1f..cdfda1d9e240f 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.23.yaml @@ -125,6 +125,7 @@ tests: cluster_profile: openshift-org-aws env: ENABLE_IDMS: "yes" + EXTRACT_MANIFEST_INCLUDED: "true" FEATURE_SET: TechPreviewNoUpgrade observers: enable: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.0.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.0.yaml index c023584291bfe..39db018cda0f0 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.0.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.0.yaml @@ -126,6 +126,7 @@ tests: cluster_profile: openshift-org-aws env: ENABLE_IDMS: "yes" + EXTRACT_MANIFEST_INCLUDED: "true" FEATURE_SET: TechPreviewNoUpgrade observers: enable: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.1.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.1.yaml index a511c480ceb98..014fe03588203 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.1.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-5.1.yaml @@ -125,6 +125,7 @@ tests: cluster_profile: openshift-org-aws env: ENABLE_IDMS: "yes" + EXTRACT_MANIFEST_INCLUDED: "true" FEATURE_SET: TechPreviewNoUpgrade observers: enable: