CNTRLPLANE-3509: Resolve N-minor release images via release controller API (v2)

ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

@@ -77,21 +77,6 @@ releases:
       include_built_images: true
       name: "5.0"
       namespace: ocp
-  latest-418:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.18"
-  latest-419:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.19"
-  latest-420:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.20"
   latest-421:
     candidate:
       product: ocp
@@ -115,26 +100,6 @@ releases:
       product: ocp
       stream: nightly
       version: "5.0"
-  n1minor:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.22"
-  n2minor:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.21"
-  n3minor:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.20"
-  n4minor:
-    candidate:
-      product: ocp
-      stream: ci
-      version: "4.19"
 resources:
   '*':
     limits:
@@ -156,11 +121,6 @@ tests:
   pipeline_skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor|test/envtest)/)|(\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$)|(^\.coderabbit\.yaml$)|(^\.dockerignore$)|(^codecov\.yml$)
   steps:
     cluster_profile: hypershift-aks
-    dependencies:
-      OCP_IMAGE_N1: release:n1minor
-      OCP_IMAGE_N2: release:n2minor
-      OCP_IMAGE_N3: release:n3minor
-      OCP_IMAGE_N4: release:n4minor
     env:
       AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
@@ -169,6 +129,10 @@ tests:
       HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_PUBLISHER: ""
       HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_SKU: ""
       HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_VERSION: ""
+      NODEPOOL_N1_VERSION: "4.22"
+      NODEPOOL_N2_VERSION: "4.21"
+      NODEPOOL_N3_VERSION: "4.20"
+      NODEPOOL_N4_VERSION: "4.19"
     post:
     - ref: hypershift-analyze-e2e-failure
     - chain: cucushift-installer-rehearse-azure-aks-deprovision
@@ -180,15 +144,15 @@ tests:
     cluster_profile: hypershift-aks
     dependencies:
       OCP_IMAGE_LATEST: release:latest-422
-      OCP_IMAGE_N1: release:latest-421
-      OCP_IMAGE_N2: release:latest-420
-      OCP_IMAGE_N3: release:latest-419
-      OCP_IMAGE_N4: release:latest-418
       OCP_IMAGE_PREVIOUS: release:initial-422
     env:
       AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: centralus
+      NODEPOOL_N1_VERSION: "4.21"
+      NODEPOOL_N2_VERSION: "4.20"
+      NODEPOOL_N3_VERSION: "4.19"
+      NODEPOOL_N4_VERSION: "4.18"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aks-override
   run_if_changed: (/overrides\.yaml$)
@@ -207,13 +171,12 @@ tests:
   pipeline_skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor|test/envtest)/)|(\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$)|(^\.coderabbit\.yaml$)|(^\.dockerignore$)|(^codecov\.yml$)
   steps:
     cluster_profile: hypershift-aws
-    dependencies:
-      OCP_IMAGE_N1: release:n1minor
-      OCP_IMAGE_N2: release:n2minor
-      OCP_IMAGE_N3: release:n3minor
-      OCP_IMAGE_N4: release:n4minor
     env:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      NODEPOOL_N1_VERSION: "4.22"
+      NODEPOOL_N2_VERSION: "4.21"
+      NODEPOOL_N3_VERSION: "4.20"
+      NODEPOOL_N4_VERSION: "4.19"
       REQUEST_SERVING_COMPONENT_TEST: "true"
     post:
     - ref: hypershift-analyze-e2e-failure
@@ -283,39 +246,36 @@ tests:
   pipeline_skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor|test/envtest)/)|(\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$)|(^\.coderabbit\.yaml$)|(^\.dockerignore$)|(^codecov\.yml$)
   steps:
     cluster_profile: hypershift-azure
-    dependencies:
-      OCP_IMAGE_N1: release:n1minor
     env:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: centralus
+      NODEPOOL_N1_VERSION: "4.22"
     workflow: hypershift-azure-e2e-v2-self-managed
 - always_run: false
   as: e2e-aws-minimal
   optional: true
   steps:
     cluster_profile: hypershift-aws
-    dependencies:
-      OCP_IMAGE_N1: release:n1minor
-      OCP_IMAGE_N2: release:n2minor
-      OCP_IMAGE_N3: release:n3minor
-      OCP_IMAGE_N4: release:n4minor
     env:
       CI_TESTS_RUN: (^(TestCreateCluster$|TestCreateClusterV2$))
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      NODEPOOL_N1_VERSION: "4.22"
+      NODEPOOL_N2_VERSION: "4.21"
+      NODEPOOL_N3_VERSION: "4.20"
+      NODEPOOL_N4_VERSION: "4.19"
       REQUEST_SERVING_COMPONENT_TEST: "true"
     workflow: hypershift-aws-e2e-nested
 - always_run: false
   as: e2e-aws-techpreview
   optional: true
   steps:
     cluster_profile: hypershift-aws
-    dependencies:
-      OCP_IMAGE_N1: release:n1minor
-      OCP_IMAGE_N2: release:n2minor
-      OCP_IMAGE_N3: release:n3minor
-      OCP_IMAGE_N4: release:n4minor
     env:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      NODEPOOL_N1_VERSION: "4.22"
+      NODEPOOL_N2_VERSION: "4.21"
+      NODEPOOL_N3_VERSION: "4.20"
+      NODEPOOL_N4_VERSION: "4.19"
       REQUEST_SERVING_COMPONENT_TEST: "true"
       TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-aws-e2e-nested
@@ -353,13 +313,13 @@ tests:
     cluster_profile: hypershift-aws
     dependencies:
       OCP_IMAGE_LATEST: release:latest-422
-      OCP_IMAGE_N1: release:latest-421
-      OCP_IMAGE_N2: release:latest-420
-      OCP_IMAGE_N3: release:latest-419
-      OCP_IMAGE_N4: release:latest-418
       OCP_IMAGE_PREVIOUS: release:initial-422
     env:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      NODEPOOL_N1_VERSION: "4.21"
+      NODEPOOL_N2_VERSION: "4.20"
+      NODEPOOL_N3_VERSION: "4.19"
+      NODEPOOL_N4_VERSION: "4.18"
       REQUEST_SERVING_COMPONENT_TEST: "true"
       RUN_KARPENTER_TESTS: "true"
     workflow: hypershift-aws-e2e-nested

ci-operator/step-registry/hypershift/aws/e2e/external/hypershift-aws-e2e-external-workflow.yaml

@@ -21,3 +21,4 @@ workflow:
     pre:
     - ref: ipi-install-rbac
     - chain: hypershift-setup-root-management-cluster
+    - ref: hypershift-resolve-nodepool-releases

ci-operator/step-registry/hypershift/aws/e2e/external/oidc/hypershift-aws-e2e-external-oidc-workflow.yaml

@@ -16,3 +16,4 @@ workflow:
     - chain: hypershift-setup-nested-management-cluster
     - ref: idp-external-oidc-keycloak-server
     - ref: hypershift-install
+    - ref: hypershift-resolve-nodepool-releases

ci-operator/step-registry/hypershift/aws/e2e/metrics/hypershift-aws-e2e-metrics-workflow.yaml

@@ -34,3 +34,4 @@ workflow:
     - chain: hypershift-setup-nested-management-cluster
     - ref: hypershift-install
     - ref: hypershift-install-metrics
+    - ref: hypershift-resolve-nodepool-releases

ci-operator/step-registry/hypershift/aws/e2e/nested/hypershift-aws-e2e-nested-workflow.yaml

@@ -31,4 +31,5 @@ workflow:
     pre:
     - ref: ipi-install-rbac
     - chain: hypershift-setup-nested-management-cluster
-    - ref: hypershift-install
+    - ref: hypershift-install
+    - ref: hypershift-resolve-nodepool-releases

ci-operator/step-registry/hypershift/aws/run-e2e/external/hypershift-aws-run-e2e-external-commands.sh

@@ -43,27 +43,30 @@ if [[ "${AWS_MULTI_ARCH:-}" == "true" ]]; then
   AWS_MULTI_ARCH_PARAMS="--e2e.aws-multi-arch=true"
 fi
 
+if [[ -f "${SHARED_DIR}/nodepool_release_images" ]]; then
+    source "${SHARED_DIR}/nodepool_release_images"
+fi
+
 N1_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N1} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N1:-}" && "${OCP_IMAGE_N1}" != "${OCP_IMAGE_LATEST}" ]]; then
   N1_NP_VERSION_TEST_ARGS="--e2e.n1-minor-release-image=${OCP_IMAGE_N1}"
 fi
 
 N2_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N2} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N2:-}" && "${OCP_IMAGE_N2}" != "${OCP_IMAGE_LATEST}" ]]; then
   N2_NP_VERSION_TEST_ARGS="--e2e.n2-minor-release-image=${OCP_IMAGE_N2}"
 fi
 
 N3_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N3} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N3:-}" && "${OCP_IMAGE_N3}" != "${OCP_IMAGE_LATEST}" ]]; then
   N3_NP_VERSION_TEST_ARGS="--e2e.n3-minor-release-image=${OCP_IMAGE_N3}"
 fi
 
 N4_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N4} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N4:-}" && "${OCP_IMAGE_N4}" != "${OCP_IMAGE_LATEST}" ]]; then
   N4_NP_VERSION_TEST_ARGS="--e2e.n4-minor-release-image=${OCP_IMAGE_N4}"
 fi
 
-
 ADDITIONAL_PULL_SECRET_PARAMS=""
 if check_e2e_flag 'e2e.additional-pull-secret-file' && [[ -f /etc/hypershift-additional-pull-secret/.dockerconfigjson ]]; then
   ADDITIONAL_PULL_SECRET_PARAMS="--e2e.additional-pull-secret-file=/etc/hypershift-additional-pull-secret/.dockerconfigjson"

ci-operator/step-registry/hypershift/aws/run-e2e/nested/hypershift-aws-run-e2e-nested-commands.sh

@@ -43,23 +43,27 @@ if [[ "${AWS_MULTI_ARCH:-}" == "true" ]]; then
   AWS_MULTI_ARCH_PARAMS="--e2e.aws-multi-arch=true"
 fi
 
+if [[ -f "${SHARED_DIR}/nodepool_release_images" ]]; then
+    source "${SHARED_DIR}/nodepool_release_images"
+fi
+
 N1_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N1} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N1:-}" && "${OCP_IMAGE_N1}" != "${OCP_IMAGE_LATEST}" ]]; then
   N1_NP_VERSION_TEST_ARGS="--e2e.n1-minor-release-image=${OCP_IMAGE_N1}"
 fi
 
 N2_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N2} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N2:-}" && "${OCP_IMAGE_N2}" != "${OCP_IMAGE_LATEST}" ]]; then
   N2_NP_VERSION_TEST_ARGS="--e2e.n2-minor-release-image=${OCP_IMAGE_N2}"
 fi
 
 N3_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N3} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N3:-}" && "${OCP_IMAGE_N3}" != "${OCP_IMAGE_LATEST}" ]]; then
   N3_NP_VERSION_TEST_ARGS="--e2e.n3-minor-release-image=${OCP_IMAGE_N3}"
 fi
 
 N4_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N4} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N4:-}" && "${OCP_IMAGE_N4}" != "${OCP_IMAGE_LATEST}" ]]; then
   N4_NP_VERSION_TEST_ARGS="--e2e.n4-minor-release-image=${OCP_IMAGE_N4}"
 fi
 

ci-operator/step-registry/hypershift/azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml

@@ -23,7 +23,8 @@ workflow:
     - chain: cucushift-installer-rehearse-azure-aks-provision
     - ref: hypershift-azure-aks-attach-kv
     - ref: hypershift-install
-    - ref: cucushift-hypershift-extended-k8s-mgmt-get-guest-annotations 
+    - ref: cucushift-hypershift-extended-k8s-mgmt-get-guest-annotations
+    - ref: hypershift-resolve-nodepool-releases
     test:
     - ref: hypershift-azure-run-e2e
     post:

ci-operator/step-registry/hypershift/azure/aks/external-oidc/hypershift-azure-aks-external-oidc-workflow.yaml

@@ -10,7 +10,8 @@ workflow:
     - ref: idp-external-oidc-keycloak-aks-server
     - ref: hypershift-azure-aks-attach-kv
     - ref: hypershift-install
-    - ref: cucushift-hypershift-extended-k8s-mgmt-get-guest-annotations 
+    - ref: cucushift-hypershift-extended-k8s-mgmt-get-guest-annotations
+    - ref: hypershift-resolve-nodepool-releases
     test:
     - ref: hypershift-azure-run-e2e
     post:

ci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-commands.sh

@@ -6,4 +6,8 @@ set -exuo pipefail
 export KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
 export HYPERSHIFT_BINARY="${HYPERSHIFT_BINARY:-/hypershift/bin/hypershift}"
 
+if [[ -f "${SHARED_DIR}/nodepool_release_images" ]]; then
+    source "${SHARED_DIR}/nodepool_release_images"
+fi
+
 /hypershift/bin/create-guests

ci-operator/step-registry/hypershift/azure/create-selfmanaged-guests/hypershift-azure-create-selfmanaged-guests-ref.yaml

@@ -15,7 +15,7 @@ ref:
   dependencies:
   - name: "release:latest"
     env: RELEASE_IMAGE_LATEST
-  - name: "release:n1minor"
+  - name: "release:latest"
     env: OCP_IMAGE_N1
   env:
   - name: HYPERSHIFT_NODE_COUNT

ci-operator/step-registry/hypershift/azure/e2e/self-managed/hypershift-azure-e2e-self-managed-workflow.yaml

@@ -29,6 +29,7 @@ workflow:
     - chain: hypershift-setup-nested-management-cluster
     - ref: hypershift-azure-setup-private-link
     - ref: hypershift-install
+    - ref: hypershift-resolve-nodepool-releases
     env:
       CLOUD_PROVIDER: "Azure"
       HYPERSHIFT_NODE_COUNT: "2"

ci-operator/step-registry/hypershift/azure/e2e/v2-self-managed/hypershift-azure-e2e-v2-self-managed-workflow.yaml

@@ -24,6 +24,7 @@ workflow:
     - chain: hypershift-setup-nested-management-cluster
     - ref: hypershift-azure-setup-private-link
     - ref: hypershift-install
+    - ref: hypershift-resolve-nodepool-releases
     - chain: hypershift-azure-create-selfmanaged-guests
     test:
     - chain: hypershift-azure-run-e2e-v2-selfmanaged

ci-operator/step-registry/hypershift/azure/run-e2e-self-managed/hypershift-azure-run-e2e-self-managed-commands.sh

@@ -36,13 +36,17 @@ check_e2e_flag() {
   return $?
 }
 
+if [[ -f "${SHARED_DIR}/nodepool_release_images" ]]; then
+    source "${SHARED_DIR}/nodepool_release_images"
+fi
+
 N1_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N1} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N1:-}" && "${OCP_IMAGE_N1}" != "${OCP_IMAGE_LATEST}" ]]; then
   N1_NP_VERSION_TEST_ARGS="--e2e.n1-minor-release-image=${OCP_IMAGE_N1}"
 fi
 
 N2_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N2} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N2:-}" && "${OCP_IMAGE_N2}" != "${OCP_IMAGE_LATEST}" ]]; then
   N2_NP_VERSION_TEST_ARGS="--e2e.n2-minor-release-image=${OCP_IMAGE_N2}"
 fi
 

ci-operator/step-registry/hypershift/azure/run-e2e/hypershift-azure-run-e2e-commands.sh

@@ -67,23 +67,27 @@ if [[ -n "$HYPERSHIFT_MANAGED_SERVICE" ]]; then
     export MANAGED_SERVICE="$HYPERSHIFT_MANAGED_SERVICE"
 fi
 
+if [[ -f "${SHARED_DIR}/nodepool_release_images" ]]; then
+    source "${SHARED_DIR}/nodepool_release_images"
+fi
+
 N1_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N1} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N1:-}" && "${OCP_IMAGE_N1}" != "${OCP_IMAGE_LATEST}" ]]; then
   N1_NP_VERSION_TEST_ARGS="--e2e.n1-minor-release-image=${OCP_IMAGE_N1}"
 fi
 
 N2_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N2} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N2:-}" && "${OCP_IMAGE_N2}" != "${OCP_IMAGE_LATEST}" ]]; then
   N2_NP_VERSION_TEST_ARGS="--e2e.n2-minor-release-image=${OCP_IMAGE_N2}"
 fi
 
 N3_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N3} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N3:-}" && "${OCP_IMAGE_N3}" != "${OCP_IMAGE_LATEST}" ]]; then
   N3_NP_VERSION_TEST_ARGS="--e2e.n3-minor-release-image=${OCP_IMAGE_N3}"
 fi
 
 N4_NP_VERSION_TEST_ARGS=""
-if [[ ${OCP_IMAGE_N4} != "${OCP_IMAGE_LATEST}" ]]; then
+if [[ -n "${OCP_IMAGE_N4:-}" && "${OCP_IMAGE_N4}" != "${OCP_IMAGE_LATEST}" ]]; then
   N4_NP_VERSION_TEST_ARGS="--e2e.n4-minor-release-image=${OCP_IMAGE_N4}"
 fi
 

ci-operator/step-registry/hypershift/resolve-nodepool-releases/OWNERS

@@ -0,0 +1,12 @@
+approvers:
+  - jparrill
+  - bryan-cox
+  - csrwng
+  - sjenning
+  - enxebre
+reviewers:
+  - jparrill
+  - bryan-cox
+  - csrwng
+  - sjenning
+  - enxebre