Merge pull request #1143 from nimrodshn/add_image_digest_mirrors

Add ImageDigestMirrors field to ClusterRegistryConfig

Author: openshift-merge-bot[bot]

clientapi/arohcp/v1alpha1/cluster_registry_config_builder.go

@@ -40,14 +40,15 @@ type ClusterRegistryConfigBuilder struct {
 	fieldSet_                  []bool
 	additionalTrustedCa        map[string]string
 	allowedRegistriesForImport []*RegistryLocationBuilder
+	imageDigestMirrors         []*ImageMirrorBuilder
 	platformAllowlist          *RegistryAllowlistBuilder
 	registrySources            *RegistrySourcesBuilder
 }
 
 // NewClusterRegistryConfig creates a new builder of 'cluster_registry_config' objects.
 func NewClusterRegistryConfig() *ClusterRegistryConfigBuilder {
 	return &ClusterRegistryConfigBuilder{
-		fieldSet_: make([]bool, 4),
+		fieldSet_: make([]bool, 5),
 	}
 }
 
@@ -67,7 +68,7 @@ func (b *ClusterRegistryConfigBuilder) Empty() bool {
 // AdditionalTrustedCa sets the value of the 'additional_trusted_ca' attribute to the given value.
 func (b *ClusterRegistryConfigBuilder) AdditionalTrustedCa(value map[string]string) *ClusterRegistryConfigBuilder {
 	if len(b.fieldSet_) == 0 {
-		b.fieldSet_ = make([]bool, 4)
+		b.fieldSet_ = make([]bool, 5)
 	}
 	b.additionalTrustedCa = value
 	if value != nil {
@@ -81,26 +82,37 @@ func (b *ClusterRegistryConfigBuilder) AdditionalTrustedCa(value map[string]stri
 // AllowedRegistriesForImport sets the value of the 'allowed_registries_for_import' attribute to the given values.
 func (b *ClusterRegistryConfigBuilder) AllowedRegistriesForImport(values ...*RegistryLocationBuilder) *ClusterRegistryConfigBuilder {
 	if len(b.fieldSet_) == 0 {
-		b.fieldSet_ = make([]bool, 4)
+		b.fieldSet_ = make([]bool, 5)
 	}
 	b.allowedRegistriesForImport = make([]*RegistryLocationBuilder, len(values))
 	copy(b.allowedRegistriesForImport, values)
 	b.fieldSet_[1] = true
 	return b
 }
 
+// ImageDigestMirrors sets the value of the 'image_digest_mirrors' attribute to the given values.
+func (b *ClusterRegistryConfigBuilder) ImageDigestMirrors(values ...*ImageMirrorBuilder) *ClusterRegistryConfigBuilder {
+	if len(b.fieldSet_) == 0 {
+		b.fieldSet_ = make([]bool, 5)
+	}
+	b.imageDigestMirrors = make([]*ImageMirrorBuilder, len(values))
+	copy(b.imageDigestMirrors, values)
+	b.fieldSet_[2] = true
+	return b
+}
+
 // PlatformAllowlist sets the value of the 'platform_allowlist' attribute to the given value.
 //
 // RegistryAllowlist represents a single registry allowlist.
 func (b *ClusterRegistryConfigBuilder) PlatformAllowlist(value *RegistryAllowlistBuilder) *ClusterRegistryConfigBuilder {
 	if len(b.fieldSet_) == 0 {
-		b.fieldSet_ = make([]bool, 4)
+		b.fieldSet_ = make([]bool, 5)
 	}
 	b.platformAllowlist = value
 	if value != nil {
-		b.fieldSet_[2] = true
+		b.fieldSet_[3] = true
 	} else {
-		b.fieldSet_[2] = false
+		b.fieldSet_[3] = false
 	}
 	return b
 }
@@ -112,13 +124,13 @@ func (b *ClusterRegistryConfigBuilder) PlatformAllowlist(value *RegistryAllowlis
 // It does not contain configuration for the internal cluster registry.
 func (b *ClusterRegistryConfigBuilder) RegistrySources(value *RegistrySourcesBuilder) *ClusterRegistryConfigBuilder {
 	if len(b.fieldSet_) == 0 {
-		b.fieldSet_ = make([]bool, 4)
+		b.fieldSet_ = make([]bool, 5)
 	}
 	b.registrySources = value
 	if value != nil {
-		b.fieldSet_[3] = true
+		b.fieldSet_[4] = true
 	} else {
-		b.fieldSet_[3] = false
+		b.fieldSet_[4] = false
 	}
 	return b
 }
@@ -148,6 +160,14 @@ func (b *ClusterRegistryConfigBuilder) Copy(object *ClusterRegistryConfig) *Clus
 	} else {
 		b.allowedRegistriesForImport = nil
 	}
+	if object.imageDigestMirrors != nil {
+		b.imageDigestMirrors = make([]*ImageMirrorBuilder, len(object.imageDigestMirrors))
+		for i, v := range object.imageDigestMirrors {
+			b.imageDigestMirrors[i] = NewImageMirror().Copy(v)
+		}
+	} else {
+		b.imageDigestMirrors = nil
+	}
 	if object.platformAllowlist != nil {
 		b.platformAllowlist = NewRegistryAllowlist().Copy(object.platformAllowlist)
 	} else {
@@ -183,6 +203,15 @@ func (b *ClusterRegistryConfigBuilder) Build() (object *ClusterRegistryConfig, e
 			}
 		}
 	}
+	if b.imageDigestMirrors != nil {
+		object.imageDigestMirrors = make([]*ImageMirror, len(b.imageDigestMirrors))
+		for i, v := range b.imageDigestMirrors {
+			object.imageDigestMirrors[i], err = v.Build()
+			if err != nil {
+				return
+			}
+		}
+	}
 	if b.platformAllowlist != nil {
 		object.platformAllowlist, err = b.platformAllowlist.Build()
 		if err != nil {

clientapi/arohcp/v1alpha1/cluster_registry_config_type.go

@@ -42,6 +42,7 @@ type ClusterRegistryConfig struct {
 	fieldSet_                  []bool
 	additionalTrustedCa        map[string]string
 	allowedRegistriesForImport []*RegistryLocation
+	imageDigestMirrors         []*ImageMirror
 	platformAllowlist          *RegistryAllowlist
 	registrySources            *RegistrySources
 }
@@ -117,14 +118,45 @@ func (o *ClusterRegistryConfig) GetAllowedRegistriesForImport() (value []*Regist
 	return
 }
 
+// ImageDigestMirrors returns the value of the 'image_digest_mirrors' attribute, or
+// the zero value of the type if the attribute doesn't have a value.
+//
+// ImageDigestMirrors contains the configuration for the image mirroring based on digest.
+// This field is optional and mutable. The default value is nil. The maximum number of image mirror entries is 252.
+// This fields contents is used to create the ImageDigestMirrorSet on the cluster nodes by Hypershift.
+// Each image mirror specified here is propogated to the entries in the ImageDigestMirrorSet by Hypershift.
+// See for more information: https://docs.redhat.com/en/documentation/openshift_container_platform/4.21/html/config_apis/imagedigestmirrorset-config-openshift-io-v1#imagedigestmirrorset-config-openshift-io-v1.
+func (o *ClusterRegistryConfig) ImageDigestMirrors() []*ImageMirror {
+	if o != nil && len(o.fieldSet_) > 2 && o.fieldSet_[2] {
+		return o.imageDigestMirrors
+	}
+	return nil
+}
+
+// GetImageDigestMirrors returns the value of the 'image_digest_mirrors' attribute and
+// a flag indicating if the attribute has a value.
+//
+// ImageDigestMirrors contains the configuration for the image mirroring based on digest.
+// This field is optional and mutable. The default value is nil. The maximum number of image mirror entries is 252.
+// This fields contents is used to create the ImageDigestMirrorSet on the cluster nodes by Hypershift.
+// Each image mirror specified here is propogated to the entries in the ImageDigestMirrorSet by Hypershift.
+// See for more information: https://docs.redhat.com/en/documentation/openshift_container_platform/4.21/html/config_apis/imagedigestmirrorset-config-openshift-io-v1#imagedigestmirrorset-config-openshift-io-v1.
+func (o *ClusterRegistryConfig) GetImageDigestMirrors() (value []*ImageMirror, ok bool) {
+	ok = o != nil && len(o.fieldSet_) > 2 && o.fieldSet_[2]
+	if ok {
+		value = o.imageDigestMirrors
+	}
+	return
+}
+
 // PlatformAllowlist returns the value of the 'platform_allowlist' attribute, or
 // the zero value of the type if the attribute doesn't have a value.
 //
 // PlatformAllowlist contains a reference to a RegistryAllowlist which is a list of internal registries
 // which needs to be whitelisted for the platform to work. It can be omitted at creation and
 // updating and its lifecycle can be managed separately if needed.
 func (o *ClusterRegistryConfig) PlatformAllowlist() *RegistryAllowlist {
-	if o != nil && len(o.fieldSet_) > 2 && o.fieldSet_[2] {
+	if o != nil && len(o.fieldSet_) > 3 && o.fieldSet_[3] {
 		return o.platformAllowlist
 	}
 	return nil
@@ -137,7 +169,7 @@ func (o *ClusterRegistryConfig) PlatformAllowlist() *RegistryAllowlist {
 // which needs to be whitelisted for the platform to work. It can be omitted at creation and
 // updating and its lifecycle can be managed separately if needed.
 func (o *ClusterRegistryConfig) GetPlatformAllowlist() (value *RegistryAllowlist, ok bool) {
-	ok = o != nil && len(o.fieldSet_) > 2 && o.fieldSet_[2]
+	ok = o != nil && len(o.fieldSet_) > 3 && o.fieldSet_[3]
 	if ok {
 		value = o.platformAllowlist
 	}
@@ -152,7 +184,7 @@ func (o *ClusterRegistryConfig) GetPlatformAllowlist() (value *RegistryAllowlist
 // whether or not to allow insecure access). It does not contain configuration for the
 // internal cluster registry.
 func (o *ClusterRegistryConfig) RegistrySources() *RegistrySources {
-	if o != nil && len(o.fieldSet_) > 3 && o.fieldSet_[3] {
+	if o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4] {
 		return o.registrySources
 	}
 	return nil
@@ -166,7 +198,7 @@ func (o *ClusterRegistryConfig) RegistrySources() *RegistrySources {
 // whether or not to allow insecure access). It does not contain configuration for the
 // internal cluster registry.
 func (o *ClusterRegistryConfig) GetRegistrySources() (value *RegistrySources, ok bool) {
-	ok = o != nil && len(o.fieldSet_) > 3 && o.fieldSet_[3]
+	ok = o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4]
 	if ok {
 		value = o.registrySources
 	}

clientapi/arohcp/v1alpha1/cluster_registry_config_type_json.go

@@ -81,7 +81,16 @@ func WriteClusterRegistryConfig(object *ClusterRegistryConfig, stream *jsoniter.
 		WriteRegistryLocationList(object.allowedRegistriesForImport, stream)
 		count++
 	}
-	present_ = len(object.fieldSet_) > 2 && object.fieldSet_[2] && object.platformAllowlist != nil
+	present_ = len(object.fieldSet_) > 2 && object.fieldSet_[2] && object.imageDigestMirrors != nil
+	if present_ {
+		if count > 0 {
+			stream.WriteMore()
+		}
+		stream.WriteObjectField("image_digest_mirrors")
+		WriteImageMirrorList(object.imageDigestMirrors, stream)
+		count++
+	}
+	present_ = len(object.fieldSet_) > 3 && object.fieldSet_[3] && object.platformAllowlist != nil
 	if present_ {
 		if count > 0 {
 			stream.WriteMore()
@@ -90,7 +99,7 @@ func WriteClusterRegistryConfig(object *ClusterRegistryConfig, stream *jsoniter.
 		WriteRegistryAllowlist(object.platformAllowlist, stream)
 		count++
 	}
-	present_ = len(object.fieldSet_) > 3 && object.fieldSet_[3] && object.registrySources != nil
+	present_ = len(object.fieldSet_) > 4 && object.fieldSet_[4] && object.registrySources != nil
 	if present_ {
 		if count > 0 {
 			stream.WriteMore()
@@ -116,7 +125,7 @@ func UnmarshalClusterRegistryConfig(source interface{}) (object *ClusterRegistry
 // ReadClusterRegistryConfig reads a value of the 'cluster_registry_config' type from the given iterator.
 func ReadClusterRegistryConfig(iterator *jsoniter.Iterator) *ClusterRegistryConfig {
 	object := &ClusterRegistryConfig{
-		fieldSet_: make([]bool, 4),
+		fieldSet_: make([]bool, 5),
 	}
 	for {
 		field := iterator.ReadObject()
@@ -140,14 +149,18 @@ func ReadClusterRegistryConfig(iterator *jsoniter.Iterator) *ClusterRegistryConf
 			value := ReadRegistryLocationList(iterator)
 			object.allowedRegistriesForImport = value
 			object.fieldSet_[1] = true
+		case "image_digest_mirrors":
+			value := ReadImageMirrorList(iterator)
+			object.imageDigestMirrors = value
+			object.fieldSet_[2] = true
 		case "platform_allowlist":
 			value := ReadRegistryAllowlist(iterator)
 			object.platformAllowlist = value
-			object.fieldSet_[2] = true
+			object.fieldSet_[3] = true
 		case "registry_sources":
 			value := ReadRegistrySources(iterator)
 			object.registrySources = value
-			object.fieldSet_[3] = true
+			object.fieldSet_[4] = true
 		default:
 			iterator.ReadAny()
 		}

model/aro_hcp/v1alpha1/cluster_registry_config_type.model

@@ -50,6 +50,12 @@ struct ClusterRegistryConfig {
 	// whether or not to allow insecure access). It does not contain configuration for the
 	// internal cluster registry.
 	RegistrySources RegistrySources
+	// ImageDigestMirrors contains the configuration for the image mirroring based on digest.
+	// This field is optional and mutable. The default value is nil. The maximum number of image mirror entries is 252.
+	// This fields contents is used to create the ImageDigestMirrorSet on the cluster nodes by Hypershift.
+	// Each image mirror specified here is propogated to the entries in the ImageDigestMirrorSet by Hypershift.
+	// See for more information: https://docs.redhat.com/en/documentation/openshift_container_platform/4.21/html/config_apis/imagedigestmirrorset-config-openshift-io-v1#imagedigestmirrorset-config-openshift-io-v1.
+	ImageDigestMirrors []ImageMirror
 }
 
 // RegistrySources contains configuration that determines how the container runtime should treat individual

openapi/aro_hcp/v1alpha1/openapi.json

@@ -5314,6 +5314,13 @@
               "$ref": "#/components/schemas/RegistryLocation"
             }
           },
+          "image_digest_mirrors": {
+            "description": "ImageDigestMirrors contains the configuration for the image mirroring based on digest.\nThis field is optional and mutable. The default value is nil. The maximum number of image mirror entries is 252.\nThis fields contents is used to create the ImageDigestMirrorSet on the cluster nodes by Hypershift.\nEach image mirror specified here is propogated to the entries in the ImageDigestMirrorSet by Hypershift.\nSee for more information: https://docs.redhat.com/en/documentation/openshift_container_platform/4.21/html/config_apis/imagedigestmirrorset-config-openshift-io-v1#imagedigestmirrorset-config-openshift-io-v1.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ImageMirror"
+            }
+          },
           "platform_allowlist": {
             "description": "PlatformAllowlist contains a reference to a RegistryAllowlist which is a list of internal registries\nwhich needs to be whitelisted for the platform to work. It can be omitted at creation and \nupdating and its lifecycle can be managed separately if needed.",
             "$ref": "#/components/schemas/RegistryAllowlist"