Merge pull request #1881 from deepsm007/update_image_registry_SSA_tags

Update SSA tag markers
openshift · May 7, 2024 · d591253 · d591253
2 parents 0a2abb2 + 6cbdd63
commit d591253
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 28 deletions.
diff --git a/imageregistry/v1/types.go b/imageregistry/v1/types.go
@@ -105,7 +105,6 @@ type ImageRegistrySpec struct {
 	// nodeSelector defines the node selection constraints for the registry
 	// pod.
 	// +optional
-	// +mapType=atomic
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 	// tolerations defines the tolerations for the registry pod.
 	// +optional
@@ -118,7 +117,6 @@ type ImageRegistrySpec struct {
 	RolloutStrategy string `json:"rolloutStrategy,omitempty"`
 	// affinity is a group of node affinity scheduling rules for the image registry pod(s).
 	// +optional
-	// +structType=atomic
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
 	// topologySpreadConstraints specify how to spread matching pods among the given topology.
 	// +optional
@@ -230,7 +228,6 @@ type ImageRegistryConfigStorageS3 struct {
 	// cloudFront configures Amazon Cloudfront as the storage middleware in a
 	// registry.
 	// +optional
-	// +structType=atomic
 	CloudFront *ImageRegistryConfigStorageS3CloudFront `json:"cloudFront,omitempty"`
 	// virtualHostedStyle enables using S3 virtual hosted style bucket paths with
 	// a custom RegionEndpoint
@@ -571,7 +568,6 @@ type ImageRegistryConfigStorage struct {
 }
 
 // ImageRegistryConfigRequests defines registry limits on requests read and write.
-// +structType=atomic
 type ImageRegistryConfigRequests struct {
 	// read defines limits for image registry's reads.
 	// +optional

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-CustomNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-CustomNoUpgrade.crd.yaml
@@ -1022,7 +1022,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1064,7 +1063,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1581,7 +1579,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2301,7 +2298,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-Default.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-Default.crd.yaml
@@ -1022,7 +1022,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1064,7 +1063,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1568,7 +1566,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2275,7 +2272,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-DevPreviewNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-DevPreviewNoUpgrade.crd.yaml
@@ -1022,7 +1022,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1064,7 +1063,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1581,7 +1579,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2301,7 +2298,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-TechPreviewNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-TechPreviewNoUpgrade.crd.yaml
@@ -1022,7 +1022,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1064,7 +1063,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1581,7 +1579,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2301,7 +2298,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults

diff --git a/...d.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml b/...d.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml
@@ -1020,7 +1020,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1062,7 +1061,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1551,7 +1549,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2258,7 +2255,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults

diff --git a/....featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSizeMiB.yaml b/....featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSizeMiB.yaml
@@ -1020,7 +1020,6 @@ spec:
                         type: array
                     type: object
                 type: object
-                x-kubernetes-map-type: atomic
               defaultRoute:
                 description: defaultRoute indicates whether an external facing route
                   for the registry should be created using the default generated hostname.
@@ -1062,7 +1061,6 @@ spec:
                 description: nodeSelector defines the node selection constraints for
                   the registry pod.
                 type: object
-                x-kubernetes-map-type: atomic
               observedConfig:
                 description: observedConfig holds a sparse config that controller
                   has observed from the cluster state.  It exists in spec because
@@ -1564,7 +1562,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults
@@ -2284,7 +2281,6 @@ spec:
                         - keypairID
                         - privateKey
                         type: object
-                        x-kubernetes-map-type: atomic
                       encrypt:
                         description: encrypt specifies whether the registry stores
                           the image in encrypted format or not. Optional, defaults