Skip to content

Commit 816ffaa

Browse files
dkoshkindkoshkin
committed
refactor: rename variable to just registry
Along with that rename all files and any other related variables
1 parent 56af092 commit 816ffaa

File tree

31 files changed

+171
-167
lines changed

31 files changed

+171
-167
lines changed

‎api/v1alpha1/addon_types.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const (
2727

2828
ServiceLoadBalancerProviderMetalLB = "MetalLB"
2929

30-
RegistryMirrorProviderDistribution = "Distribution"
30+
RegistryProviderCNCFDistribution = "CNCF Distribution"
3131

3232
AddonStrategyClusterResourceSet AddonStrategy = "ClusterResourceSet"
3333
AddonStrategyHelmAddon AddonStrategy = "HelmAddon"
@@ -104,7 +104,7 @@ type GenericAddons struct {
104104
ServiceLoadBalancer *ServiceLoadBalancer `json:"serviceLoadBalancer,omitempty"`
105105

106106
// +kubebuilder:validation:Optional
107-
RegistryMirror *RegistryMirror `json:"registryMirror,omitempty"`
107+
Registry *RegistryAddon `json:"registry,omitempty"`
108108
}
109109

110110
type AddonStrategy string
@@ -341,9 +341,9 @@ type AddressRange struct {
341341
End string `json:"end"`
342342
}
343343

344-
type RegistryMirror struct {
344+
type RegistryAddon struct {
345345
// The OCI registry provider to deploy.
346-
// +kubebuilder:default=Distribution
347-
// +kubebuilder:validation:Enum=Distribution
346+
// +kubebuilder:default="CNCF Distribution"
347+
// +kubebuilder:validation:Enum="CNCF Distribution"
348348
Provider string `json:"provider"`
349349
}

‎api/v1alpha1/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const (
2828
ClusterAutoscalerVariableName = "clusterAutoscaler"
2929
// ServiceLoadBalancerVariableName is the Service LoadBalancer config patch variable name.
3030
ServiceLoadBalancerVariableName = "serviceLoadBalancer"
31-
// RegistryMirrorVariableName is the OCI registry config patch variable name.
32-
RegistryMirrorVariableName = "registryMirror"
31+
// RegistryAddonVariableName is the OCI registry config patch variable name.
32+
RegistryAddonVariableName = "registry"
3333

3434
// GlobalMirrorVariableName is the global image registry mirror patch variable name.
3535
GlobalMirrorVariableName = "globalImageRegistryMirror"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ spec:
234234
- HelmAddon
235235
type: string
236236
type: object
237-
registryMirror:
237+
registry:
238238
properties:
239239
provider:
240-
default: Distribution
240+
default: CNCF Distribution
241241
description: The OCI registry provider to deploy.
242242
enum:
243-
- Distribution
243+
- CNCF Distribution
244244
type: string
245245
required:
246246
- provider

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ spec:
243243
- HelmAddon
244244
type: string
245245
type: object
246-
registryMirror:
246+
registry:
247247
properties:
248248
provider:
249-
default: Distribution
249+
default: CNCF Distribution
250250
description: The OCI registry provider to deploy.
251251
enum:
252-
- Distribution
252+
- CNCF Distribution
253253
type: string
254254
required:
255255
- provider

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ spec:
243243
- HelmAddon
244244
type: string
245245
type: object
246-
registryMirror:
246+
registry:
247247
properties:
248248
provider:
249-
default: Distribution
249+
default: CNCF Distribution
250250
description: The OCI registry provider to deploy.
251251
enum:
252-
- Distribution
252+
- CNCF Distribution
253253
type: string
254254
required:
255255
- provider

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
8585
| hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` | |
8686
| hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
8787
| hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nfd-helm-values-template"` | |
88-
| hooks.registryMirror.distribution.defaultValueTemplateConfigMap.create | bool | `true` | |
89-
| hooks.registryMirror.distribution.defaultValueTemplateConfigMap.name | string | `"default-distribution-registry-mirror-helm-values-template"` | |
88+
| hooks.registry.cncfDistribution.defaultValueTemplateConfigMap.create | bool | `true` | |
89+
| hooks.registry.cncfDistribution.defaultValueTemplateConfigMap.name | string | `"default-cncf-distribution-registry-helm-values-template"` | |
9090
| hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.create | bool | `true` | |
9191
| hooks.serviceLoadBalancer.metalLB.defaultValueTemplateConfigMap.name | string | `"default-metallb-helm-values-template"` | |
9292
| hooks.virtualIP.kubeVip.defaultTemplateConfigMap.create | bool | `true` | |

‎charts/cluster-api-runtime-extensions-nutanix/addons/registry-mirror/distribution/values-template.yaml renamed to ‎charts/cluster-api-runtime-extensions-nutanix/addons/registry/cncf-distribution/values-template.yaml

File renamed without changes.

‎charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ data:
2323
ChartName: cluster-autoscaler
2424
ChartVersion: 9.46.3
2525
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes.github.io/autoscaler{{ end }}'
26+
cncf-distribution-registry: |
27+
ChartName: docker-registry
28+
ChartVersion: 2.3.1
29+
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/staging/{{ end }}'
2630
cosi-controller: |
2731
ChartName: cosi
2832
ChartVersion: 0.0.1-alpha.5
2933
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/stable/{{ end }}'
30-
distribution-registry-mirror: |
31-
ChartName: docker-registry
32-
ChartVersion: 2.3.1
33-
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/staging/{{ end }}'
3434
local-path-provisioner-csi: |
3535
ChartName: local-path-provisioner
3636
ChartVersion: 0.0.31

‎charts/cluster-api-runtime-extensions-nutanix/templates/registry-mirror/distribution/helm-addon-installation.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)