refactor: rename variable to just registry

Along with that rename all files and any other related variables

Author: dkoshkin

api/v1alpha1/addon_types.go

@@ -27,7 +27,7 @@ const (
 
 	ServiceLoadBalancerProviderMetalLB = "MetalLB"
 
-	RegistryMirrorProviderDistribution = "Distribution"
+	RegistryProviderCNCFDistribution = "CNCF Distribution"
 
 	AddonStrategyClusterResourceSet AddonStrategy = "ClusterResourceSet"
 	AddonStrategyHelmAddon          AddonStrategy = "HelmAddon"
@@ -104,7 +104,7 @@ type GenericAddons struct {
 	ServiceLoadBalancer *ServiceLoadBalancer `json:"serviceLoadBalancer,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	RegistryMirror *RegistryMirror `json:"registryMirror,omitempty"`
+	Registry *RegistryAddon `json:"registry,omitempty"`
 }
 
 type AddonStrategy string
@@ -341,9 +341,9 @@ type AddressRange struct {
 	End string `json:"end"`
 }
 
-type RegistryMirror struct {
+type RegistryAddon struct {
 	// The OCI registry provider to deploy.
-	// +kubebuilder:default=Distribution
-	// +kubebuilder:validation:Enum=Distribution
+	// +kubebuilder:default="CNCF Distribution"
+	// +kubebuilder:validation:Enum="CNCF Distribution"
 	Provider string `json:"provider"`
 }

api/v1alpha1/constants.go

@@ -28,8 +28,8 @@ const (
 	ClusterAutoscalerVariableName = "clusterAutoscaler"
 	// ServiceLoadBalancerVariableName is the Service LoadBalancer config patch variable name.
 	ServiceLoadBalancerVariableName = "serviceLoadBalancer"
-	// RegistryMirrorVariableName is the OCI registry config patch variable name.
-	RegistryMirrorVariableName = "registryMirror"
+	// RegistryAddonVariableName is the OCI registry config patch variable name.
+	RegistryAddonVariableName = "registry"
 
 	// GlobalMirrorVariableName is the global image registry mirror patch variable name.
 	GlobalMirrorVariableName = "globalImageRegistryMirror"

api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml

@@ -234,13 +234,13 @@ spec:
                             - HelmAddon
                           type: string
                       type: object
-                    registryMirror:
+                    registry:
                       properties:
                         provider:
-                          default: Distribution
+                          default: CNCF Distribution
                           description: The OCI registry provider to deploy.
                           enum:
-                            - Distribution
+                            - CNCF Distribution
                           type: string
                       required:
                         - provider

api/v1alpha1/crds/caren.nutanix.com_dockerclusterconfigs.yaml

@@ -243,13 +243,13 @@ spec:
                             - HelmAddon
                           type: string
                       type: object
-                    registryMirror:
+                    registry:
                       properties:
                         provider:
-                          default: Distribution
+                          default: CNCF Distribution
                           description: The OCI registry provider to deploy.
                           enum:
-                            - Distribution
+                            - CNCF Distribution
                           type: string
                       required:
                         - provider

api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml

@@ -243,13 +243,13 @@ spec:
                             - HelmAddon
                           type: string
                       type: object
-                    registryMirror:
+                    registry:
                       properties:
                         provider:
-                          default: Distribution
+                          default: CNCF Distribution
                           description: The OCI registry provider to deploy.
                           enum:
-                            - Distribution
+                            - CNCF Distribution
                           type: string
                       required:
                         - provider

api/v1alpha1/zz_generated.deepcopy.go

@@ -85,8 +85,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nfd-helm-values-template"` |  |
-| hooks.registryMirror.distribution.defaultValueTemplateConfigMap.create | bool | `true` |  |
-| hooks.registryMirror.distribution.defaultValueTemplateConfigMap.name | string | `"default-distribution-registry-mirror-helm-values-template"` |  |
+| hooks.registry.cncfDistribution.defaultValueTemplateConfigMap.create | bool | `true` |  |
+| hooks.registry.cncfDistribution.defaultValueTemplateConfigMap.name | string | `"default-cncf-distribution-registry-helm-values-template"` |  |
 | hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.name | string | `"default-metallb-helm-values-template"` |  |
 | hooks.virtualIP.kubeVip.defaultTemplateConfigMap.create | bool | `true` |  |

charts/cluster-api-runtime-extensions-nutanix/README.md

@@ -23,14 +23,14 @@ data:
     ChartName: cluster-autoscaler
     ChartVersion: 9.46.3
     RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes.github.io/autoscaler{{ end }}'
+  cncf-distribution-registry: |
+    ChartName: docker-registry
+    ChartVersion: 2.3.1
+    RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/staging/{{ end }}'
   cosi-controller: |
     ChartName: cosi
     ChartVersion: 0.0.1-alpha.5
     RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/stable/{{ end }}'
-  distribution-registry-mirror: |
-    ChartName: docker-registry
-    ChartVersion: 2.3.1
-    RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/staging/{{ end }}'
   local-path-provisioner-csi: |
     ChartName: local-path-provisioner
     ChartVersion: 0.0.31