Skip to content

Commit ad5da85

Browse files
committed
fix: rename the field to addonsMetadata
1 parent 33d436f commit ad5da85

File tree

7 files changed

+47
-148
lines changed

7 files changed

+47
-148
lines changed

api/v1alpha1/addon_types.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ type NutanixAddons struct {
8686
}
8787

8888
type GenericAddons struct {
89-
// +kubebuilder:validation:Optional
90-
HelmChartConfig *HelmChartConfig `json:"helmChartConfig,omitempty"`
91-
9289
// +kubebuilder:validation:Optional
9390
CNI *CNI `json:"cni,omitempty"`
9491

@@ -105,7 +102,7 @@ type GenericAddons struct {
105102
ServiceLoadBalancer *ServiceLoadBalancer `json:"serviceLoadBalancer,omitempty"`
106103
}
107104

108-
type HelmChartConfig struct {
105+
type AddonMetadataSpec struct {
109106
// Reference to a ConfigMap containing configuration for addons Helm charts.
110107
// +kubebuilder:validation:Required
111108
ConfigMapRef LocalObjectReference `json:"configMapRef"`

api/v1alpha1/clusterconfig_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ type AWSClusterConfigSpec struct {
7272

7373
GenericClusterConfigSpec `json:",inline"`
7474

75+
// Configuration for all addons. This configuration is stored in a ConfigMap and refererenced in the Cluster object.
76+
// This configuration is optional. If not provided, the default configuration will be used.
77+
// +kubebuilder:validation:Optional
78+
AddonsMetadata *AddonMetadataSpec `json:"addonsMetadata,omitempty"`
79+
7580
// +kubebuilder:validation:Optional
7681
Addons *AWSAddons `json:"addons,omitempty"`
7782

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -224,23 +224,6 @@ spec:
224224
- defaultStorage
225225
- providers
226226
type: object
227-
helmChartConfig:
228-
properties:
229-
configMapRef:
230-
description: Reference to a ConfigMap containing configuration for addons Helm charts.
231-
properties:
232-
name:
233-
description: |-
234-
Name of the referent.
235-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
236-
minLength: 1
237-
type: string
238-
required:
239-
- name
240-
type: object
241-
required:
242-
- configMapRef
243-
type: object
244227
nfd:
245228
description: NFD tells us to enable or disable the node feature discovery addon.
246229
properties:
@@ -290,6 +273,26 @@ spec:
290273
- provider
291274
type: object
292275
type: object
276+
addonsMetadata:
277+
description: |-
278+
Configuration for all addons. This configuration is stored in a ConfigMap and refererenced in the Cluster object.
279+
This configuration is optional. If not provided, the default configuration will be used.
280+
properties:
281+
configMapRef:
282+
description: Reference to a ConfigMap containing configuration for addons Helm charts.
283+
properties:
284+
name:
285+
description: |-
286+
Name of the referent.
287+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
288+
minLength: 1
289+
type: string
290+
required:
291+
- name
292+
type: object
293+
required:
294+
- configMapRef
295+
type: object
293296
aws:
294297
description: AWS cluster configuration.
295298
properties:

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -233,23 +233,6 @@ spec:
233233
- defaultStorage
234234
- providers
235235
type: object
236-
helmChartConfig:
237-
properties:
238-
configMapRef:
239-
description: Reference to a ConfigMap containing configuration for addons Helm charts.
240-
properties:
241-
name:
242-
description: |-
243-
Name of the referent.
244-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
245-
minLength: 1
246-
type: string
247-
required:
248-
- name
249-
type: object
250-
required:
251-
- configMapRef
252-
type: object
253236
nfd:
254237
description: NFD tells us to enable or disable the node feature discovery addon.
255238
properties:

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -233,23 +233,6 @@ spec:
233233
- defaultStorage
234234
- providers
235235
type: object
236-
helmChartConfig:
237-
properties:
238-
configMapRef:
239-
description: Reference to a ConfigMap containing configuration for addons Helm charts.
240-
properties:
241-
name:
242-
description: |-
243-
Name of the referent.
244-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
245-
minLength: 1
246-
type: string
247-
required:
248-
- name
249-
type: object
250-
required:
251-
- configMapRef
252-
type: object
253236
nfd:
254237
description: NFD tells us to enable or disable the node feature discovery addon.
255238
properties:

api/v1alpha1/zz_generated.deepcopy.go

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

docs/content/addons/custom-helm-config.md

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

0 commit comments

Comments
 (0)