OCPBUGS-43083: Fix IsIPv4 function identifying also addresses instead…

… of CIDRs The issue deploying IPv6 disconnected clusters happens on the validation of the KASEndpointSlice (https://github.com/openshift/hypershift/blob/main/control-plane-operator/hostedclusterconfigoperator/controllers/resources/kas/reconcile.go\#L32). Now that function supports IPv4/IPv6 addresses too, so the workflow is not modified but the validation and configuration of the Kubernetes endpointSlice Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
openshift · Dec 17, 2024 · a35751a · a35751a
1 parent 7ee654e
commit a35751a
Show file tree

Hide file tree

Showing 50 changed files with 180 additions and 117 deletions.
diff --git a/control-plane-operator/controllers/hostedcontrolplane/etcd/params.go b/control-plane-operator/controllers/hostedcontrolplane/etcd/params.go
@@ -40,7 +40,7 @@ func etcdPodSelector() map[string]string {
 
 func NewEtcdParams(hcp *hyperv1.HostedControlPlane, releaseImageProvider imageprovider.ReleaseImageProvider) (*EtcdParams, error) {
 
-	ipv4, err := hyputils.IsIPv4(hcp.Spec.Networking.ClusterNetwork[0].CIDR.String())
+	ipv4, err := hyputils.IsIPv4CIDR(hcp.Spec.Networking.ClusterNetwork[0].CIDR.String())
 	if err != nil {
 		return nil, fmt.Errorf("error checking the ClusterNetworkCIDR: %v", err)
 	}

diff --git a/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go b/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
@@ -988,6 +988,7 @@ func (r *HostedControlPlaneReconciler) reconcileCPOV2(ctx context.Context, hcp *
 		SetDefaultSecurityContext: r.SetDefaultSecurityContext,
 		MetricsSet:                r.MetricsSet,
 		EnableCIDebugOutput:       r.EnableCIDebugOutput,
+		ImageMetadataProvider:     r.ImageMetadataProvider,
 	}
 
 	var errs []error

diff --git a/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go b/control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
@@ -34,8 +34,10 @@ import (
 	"github.com/openshift/hypershift/support/releaseinfo"
 	fakereleaseprovider "github.com/openshift/hypershift/support/releaseinfo/fake"
 	"github.com/openshift/hypershift/support/testutil"
+	"github.com/openshift/hypershift/support/thirdparty/library-go/pkg/image/dockerv1client"
 	"github.com/openshift/hypershift/support/upsert"
 	"github.com/openshift/hypershift/support/util"
+	"github.com/openshift/hypershift/support/util/fakeimagemetadataprovider"
 	"go.uber.org/zap/zaptest"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -1649,6 +1651,7 @@ func TestControlPlaneComponents(t *testing.T) {
 					VPC: &hyperv1.PowerVSVPC{},
 				},
 			},
+			ReleaseImage: "quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64",
 		},
 	}
 
@@ -1664,8 +1667,12 @@ func TestControlPlaneComponents(t *testing.T) {
 		CreateOrUpdateProviderV2: upsert.NewV2(false),
 		ReleaseImageProvider:     testutil.FakeImageProvider(),
 		UserReleaseImageProvider: testutil.FakeImageProvider(),
-		HCP:                      hcp,
-		SkipPredicate:            true,
+		ImageMetadataProvider: &fakeimagemetadataprovider.FakeRegistryClientImageMetadataProvider{
+			Result:   &dockerv1client.DockerImageConfig{},
+			Manifest: fakeimagemetadataprovider.FakeManifest{},
+		},
+		HCP:           hcp,
+		SkipPredicate: true,
 	}
 	for _, featureSet := range []configv1.FeatureSet{configv1.Default, configv1.TechPreviewNoUpgrade} {
 		cpContext.HCP.Spec.Configuration.FeatureGate.FeatureGateSelection.FeatureSet = featureSet

diff --git a/control-plane-operator/controllers/hostedcontrolplane/pki/params.go b/control-plane-operator/controllers/hostedcontrolplane/pki/params.go
@@ -84,7 +84,7 @@ func NewPKIParams(hcp *hyperv1.HostedControlPlane,
 	// Even with that, we cannot set more than one AdvertiseAddress so both
 	// are not supported at the same time.
 	// Check this for more info: https://github.com/kubernetes/enhancements/issues/2438
-	ipv4, err := util.IsIPv4(p.ServiceCIDR[0])
+	ipv4, err := util.IsIPv4CIDR(p.ServiceCIDR[0])
 	if err != nil || ipv4 {
 		p.NodeInternalAPIServerIP = util.AdvertiseAddressWithDefault(hcp, config.DefaultAdvertiseIPv4Address)
 	} else {

diff --git a/...rolplane/testdata/cloud-controller-manager-aws/zz_fixture_TestControlPlaneComponents.yaml b/...rolplane/testdata/cloud-controller-manager-aws/zz_fixture_TestControlPlaneComponents.yaml
@@ -26,7 +26,7 @@ spec:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: cloud-token
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...ud-controller-manager-aws/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...ud-controller-manager-aws/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -26,7 +26,7 @@ spec:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: cloud-token
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...lplane/testdata/cloud-controller-manager-azure/zz_fixture_TestControlPlaneComponents.yaml b/...lplane/testdata/cloud-controller-manager-azure/zz_fixture_TestControlPlaneComponents.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...-controller-manager-azure/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...-controller-manager-azure/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...ane/testdata/cloud-controller-manager-kubevirt/zz_fixture_TestControlPlaneComponents.yaml b/...ane/testdata/cloud-controller-manager-kubevirt/zz_fixture_TestControlPlaneComponents.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...ntroller-manager-kubevirt/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...ntroller-manager-kubevirt/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cloud-controller-manager

diff --git a/...ne/testdata/cloud-controller-manager-openstack/zz_fixture_TestControlPlaneComponents.yaml b/...ne/testdata/cloud-controller-manager-openstack/zz_fixture_TestControlPlaneComponents.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         hypershift.openshift.io/control-plane-component: cloud-controller-manager-openstack

diff --git a/...troller-manager-openstack/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...troller-manager-openstack/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         hypershift.openshift.io/control-plane-component: cloud-controller-manager-openstack

diff --git a/...lane/testdata/cloud-controller-manager-powervs/zz_fixture_TestControlPlaneComponents.yaml b/...lane/testdata/cloud-controller-manager-powervs/zz_fixture_TestControlPlaneComponents.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         hypershift.openshift.io/control-plane-component: cloud-controller-manager-powervs

diff --git a/...ontroller-manager-powervs/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...ontroller-manager-powervs/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         hypershift.openshift.io/control-plane-component: cloud-controller-manager-powervs

diff --git a/...hostedcontrolplane/testdata/cluster-autoscaler/zz_fixture_TestControlPlaneComponents.yaml b/...hostedcontrolplane/testdata/cluster-autoscaler/zz_fixture_TestControlPlaneComponents.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-autoscaler

diff --git a/...stdata/cluster-autoscaler/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...stdata/cluster-autoscaler/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-autoscaler

diff --git a/...ontrolplane/testdata/cluster-policy-controller/zz_fixture_TestControlPlaneComponents.yaml b/...ontrolplane/testdata/cluster-policy-controller/zz_fixture_TestControlPlaneComponents.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-policy-controller

diff --git a/...cluster-policy-controller/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...cluster-policy-controller/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -28,7 +28,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-policy-controller

diff --git a/...controlplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents.yaml b/...controlplane/testdata/cluster-version-operator/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: payload,update-payloads
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-version-operator
@@ -85,6 +85,7 @@ spec:
         - name: CLUSTER_PROFILE
           value: ibm-cloud-managed
         - name: RELEASE_IMAGE
+          value: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         - name: NODE_NAME
           valueFrom:
             fieldRef:
@@ -287,7 +288,7 @@ spec:
           EOF
         command:
         - /bin/bash
-        image: cluster-version-operator
+        image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         imagePullPolicy: IfNotPresent
         name: prepare-payload
         resources:

diff --git a/.../cluster-version-operator/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/.../cluster-version-operator/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -30,7 +30,7 @@ spec:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: payload,update-payloads
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: cluster-version-operator
@@ -85,6 +85,7 @@ spec:
         - name: CLUSTER_PROFILE
           value: ibm-cloud-managed
         - name: RELEASE_IMAGE
+          value: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         - name: NODE_NAME
           valueFrom:
             fieldRef:
@@ -284,9 +285,10 @@ spec:
             annotations:
               include.release.openshift.io/ibm-cloud-managed: "true"
               release.openshift.io/delete: "true"
+          EOF
         command:
         - /bin/bash
-        image: cluster-version-operator
+        image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         imagePullPolicy: IfNotPresent
         name: prepare-payload
         resources:

diff --git a/...r/controllers/hostedcontrolplane/testdata/etcd/zz_fixture_TestControlPlaneComponents.yaml b/...r/controllers/hostedcontrolplane/testdata/etcd/zz_fixture_TestControlPlaneComponents.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: etcd

diff --git a/...ontrolplane/testdata/etcd/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...ontrolplane/testdata/etcd/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: etcd

diff --git a/...lplane/testdata/hosted-cluster-config-operator/zz_fixture_TestControlPlaneComponents.yaml b/...lplane/testdata/hosted-cluster-config-operator/zz_fixture_TestControlPlaneComponents.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: hosted-cluster-config-operator
@@ -89,6 +89,7 @@ spec:
         - name: KUBERNETES_VERSION
           value: "1.30"
         - name: OPERATE_ON_RELEASE_IMAGE
+          value: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         - name: OPENSHIFT_IMG_OVERRIDES
           value: =
         image: hosted-cluster-config-operator

diff --git a/...d-cluster-config-operator/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...d-cluster-config-operator/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: hosted-cluster-config-operator
@@ -89,6 +89,7 @@ spec:
         - name: KUBERNETES_VERSION
           value: "1.30"
         - name: OPERATE_ON_RELEASE_IMAGE
+          value: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
         - name: OPENSHIFT_IMG_OVERRIDES
           value: =
         image: hosted-cluster-config-operator

diff --git a/...ers/hostedcontrolplane/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents.yaml b/...ers/hostedcontrolplane/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: bootstrap-manifests,logs
         component.hypershift.openshift.io/config-hash: 19dc307e1d8949e23415eb6680075ec3
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-apiserver

diff --git a/...e/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...e/testdata/kube-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: bootstrap-manifests,logs
         component.hypershift.openshift.io/config-hash: 19dc307e1d8949e23415eb667d1e0a2d
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-apiserver

diff --git a/...dcontrolplane/testdata/kube-controller-manager/zz_fixture_TestControlPlaneComponents.yaml b/...dcontrolplane/testdata/kube-controller-manager/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: logs,certs
         component.hypershift.openshift.io/config-hash: "1252551421580954"
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-controller-manager

diff --git a/...a/kube-controller-manager/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...a/kube-controller-manager/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: logs,certs
         component.hypershift.openshift.io/config-hash: "1252551421580954"
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-controller-manager

diff --git a/...ers/hostedcontrolplane/testdata/kube-scheduler/zz_fixture_TestControlPlaneComponents.yaml b/...ers/hostedcontrolplane/testdata/kube-scheduler/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: cert-work
         component.hypershift.openshift.io/config-hash: 022a8a3a
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-scheduler

diff --git a/...e/testdata/kube-scheduler/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...e/testdata/kube-scheduler/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: cert-work
         component.hypershift.openshift.io/config-hash: 022a8a3a
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: kube-scheduler

diff --git a/...ostedcontrolplane/testdata/openshift-apiserver/zz_fixture_TestControlPlaneComponents.yaml b/...ostedcontrolplane/testdata/openshift-apiserver/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: work-logs,oas-trust-anchor
         component.hypershift.openshift.io/config-hash: 19dc307e3415eb666d06370b
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: openshift-apiserver

diff --git a/...tdata/openshift-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...tdata/openshift-apiserver/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: work-logs,oas-trust-anchor
         component.hypershift.openshift.io/config-hash: 19dc307e3415eb666d06370b
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: openshift-apiserver

diff --git a/...rolplane/testdata/openshift-controller-manager/zz_fixture_TestControlPlaneComponents.yaml b/...rolplane/testdata/openshift-controller-manager/zz_fixture_TestControlPlaneComponents.yaml
@@ -29,7 +29,7 @@ spec:
     metadata:
       annotations:
         component.hypershift.openshift.io/config-hash: 8bcb4d22
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: openshift-controller-manager

diff --git a/...nshift-controller-manager/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml b/...nshift-controller-manager/zz_fixture_TestControlPlaneComponents_TechPreviewNoUpgrade.yaml
@@ -29,7 +29,7 @@ spec:
     metadata:
       annotations:
         component.hypershift.openshift.io/config-hash: 8bcb4d22
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: openshift-controller-manager

diff --git a/...ontrolplane/testdata/openshift-oauth-apiserver/zz_fixture_TestControlPlaneComponents.yaml b/...ontrolplane/testdata/openshift-oauth-apiserver/zz_fixture_TestControlPlaneComponents.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict-local-volumes: work-logs
         component.hypershift.openshift.io/config-hash: 19dc307e3415eb66
-        hypershift.openshift.io/release-image: ""
+        hypershift.openshift.io/release-image: quay.io/openshift-release-dev/ocp-release:4.16.10-x86_64
       creationTimestamp: null
       labels:
         app: openshift-oauth-apiserver