diff --git a/api/hypershift/v1beta1/nodepool_types.go b/api/hypershift/v1beta1/nodepool_types.go index 097005deefb0..e0b66ffc5ecd 100644 --- a/api/hypershift/v1beta1/nodepool_types.go +++ b/api/hypershift/v1beta1/nodepool_types.go @@ -126,6 +126,7 @@ type NodePoolSpec struct { // KubeletConfig // ContainerRuntimeConfig // MachineConfig + // ClusterImagePolicy // ImageContentSourcePolicy // or // ImageDigestMirrorSet diff --git a/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml b/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml index c2b0569d80b5..26788d1df461 100644 --- a/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml +++ b/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml @@ -1230,6 +1230,7 @@ spec: KubeletConfig ContainerRuntimeConfig MachineConfig + ClusterImagePolicy ImageContentSourcePolicy or ImageDigestMirrorSet diff --git a/docs/content/reference/api.md b/docs/content/reference/api.md index e58e1e558598..92c08cbe9a13 100644 --- a/docs/content/reference/api.md +++ b/docs/content/reference/api.md @@ -749,6 +749,7 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io: KubeletConfig ContainerRuntimeConfig MachineConfig +ClusterImagePolicy ImageContentSourcePolicy or ImageDigestMirrorSet

@@ -6657,6 +6658,7 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io: KubeletConfig ContainerRuntimeConfig MachineConfig +ClusterImagePolicy ImageContentSourcePolicy or ImageDigestMirrorSet

diff --git a/hack/app-sre/saas_template.yaml b/hack/app-sre/saas_template.yaml index 1534f58262af..eb8741372920 100644 --- a/hack/app-sre/saas_template.yaml +++ b/hack/app-sre/saas_template.yaml @@ -56532,6 +56532,7 @@ objects: KubeletConfig ContainerRuntimeConfig MachineConfig + ClusterImagePolicy ImageContentSourcePolicy or ImageDigestMirrorSet diff --git a/hypershift-operator/controllers/nodepool/nodepool_controller.go b/hypershift-operator/controllers/nodepool/nodepool_controller.go index 2dc59ad1c121..c515e0b4d7ad 100644 --- a/hypershift-operator/controllers/nodepool/nodepool_controller.go +++ b/hypershift-operator/controllers/nodepool/nodepool_controller.go @@ -18,6 +18,7 @@ import ( "github.com/go-logr/logr" "github.com/google/uuid" configv1 "github.com/openshift/api/config/v1" + configv1alpha1 "github.com/openshift/api/config/v1alpha1" "github.com/openshift/api/operator/v1alpha1" agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1" performanceprofilev2 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/performanceprofile/v2" @@ -2139,6 +2140,7 @@ func defaultAndValidateConfigManifest(manifest []byte) ([]byte, error) { _ = mcfgv1.Install(scheme) _ = v1alpha1.Install(scheme) _ = configv1.Install(scheme) + _ = configv1alpha1.Install(scheme) yamlSerializer := serializer.NewSerializerWithOptions( serializer.DefaultMetaFactory, scheme, scheme, @@ -2159,6 +2161,7 @@ func defaultAndValidateConfigManifest(manifest []byte) ([]byte, error) { } case *v1alpha1.ImageContentSourcePolicy: case *configv1.ImageDigestMirrorSet: + case *configv1alpha1.ClusterImagePolicy: case *mcfgv1.KubeletConfig: obj.Spec.MachineConfigPoolSelector = &metav1.LabelSelector{ MatchLabels: map[string]string{ diff --git a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go index 097005deefb0..e0b66ffc5ecd 100644 --- a/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go +++ b/vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/nodepool_types.go @@ -126,6 +126,7 @@ type NodePoolSpec struct { // KubeletConfig // ContainerRuntimeConfig // MachineConfig + // ClusterImagePolicy // ImageContentSourcePolicy // or // ImageDigestMirrorSet