Skip to content

Commit dde5469

Browse files
committed
feat: removes Secret kind from API definition for addon valuesReference
1 parent 269b38b commit dde5469

5 files changed

+9
-32
lines changed

api/v1alpha1/addon_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ type AddonValues struct {
140140
// typed referenced object inside the same namespace.
141141
// This is redacted from the upstream https://pkg.go.dev/k8s.io/api/core/v1#TypedLocalObjectReference
142142
type ValuesReference struct {
143-
// Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
144-
// +kubebuilder:validation:Enum=Secret;ConfigMap
143+
// Kind is the type of resource being referenced, valid values are ('ConfigMap').
144+
// +kubebuilder:validation:Enum=ConfigMap
145145
// +kubebuilder:validation:Required
146146
Kind string `json:"kind"`
147147

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ spec:
110110
which contains inline YAML representing the values for the Helm chart.
111111
properties:
112112
kind:
113-
description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
113+
description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
114114
enum:
115-
- Secret
116115
- ConfigMap
117116
type: string
118117
name:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ spec:
110110
which contains inline YAML representing the values for the Helm chart.
111111
properties:
112112
kind:
113-
description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
113+
description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
114114
enum:
115-
- Secret
116115
- ConfigMap
117116
type: string
118117
name:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ spec:
110110
which contains inline YAML representing the values for the Helm chart.
111111
properties:
112112
kind:
113-
description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
113+
description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
114114
enum:
115-
- Secret
116115
- ConfigMap
117116
type: string
118117
name:

docs/content/addons/cni.md

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ spec:
5656
strategy: HelmAddon
5757
values:
5858
sourceRef:
59-
name: <NAME> #name of ConfigMap/Secret present in same namespace
60-
kind: <ConfigMap/Secret>
59+
name: <NAME> #name of ConfigMap present in same namespace
60+
kind: <ConfigMap>
6161
```
6262
63-
NOTE: Only ConfigMap/Secret kind objects will be allowed to refer helm values from.
63+
NOTE: Only ConfigMap kind objects will be allowed to refer helm values from.
6464
6565
ConfigMap Format -
6666
@@ -81,27 +81,7 @@ metadata:
8181
namespace: <CLUSTER_NAMESPACE>
8282
```
8383
84-
Secret Format -
85-
86-
```yaml
87-
apiVersion: v1
88-
stringData:
89-
values.yaml: |-
90-
cni:
91-
chainingMode: portmap
92-
exclusive: false
93-
ipam:
94-
mode: kubernetes
95-
kind: Secret
96-
metadata:
97-
labels:
98-
clusterctl.cluster.x-k8s.io/move: ""
99-
name: <CLUSTER_NAME>-cilium-cni-helm-values-template
100-
namespace: <CLUSTER_NAMESPACE>
101-
type: Opaque
102-
```
103-
104-
NOTE: ConfigMap/Secret should contain complete helm values for Cilium as same will be applied
84+
NOTE: ConfigMap should contain complete helm values for Cilium as same will be applied
10585
to Cilium helm chart as it is.
10686
10787
To deploy the addon via `ClusterResourceSet` replace the value of `strategy` with `ClusterResourceSet`.

0 commit comments

Comments
 (0)