Skip to content

Commit ec85141

Browse files
committed
Mark all remaining KubeadmConfig array fields as atomic
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent 7cbb3b4 commit ec85141

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ type InitConfiguration struct {
7777
// bootstrapTokens is respected at `kubeadm init` time and describes a set of Bootstrap Tokens to create.
7878
// This information IS NOT uploaded to the kubeadm cluster configmap, partly because of its sensitive nature
7979
// +optional
80+
// +listType=atomic
8081
// +kubebuilder:validation:MaxItems=100
8182
BootstrapTokens []BootstrapToken `json:"bootstrapTokens,omitempty"`
8283

@@ -200,13 +201,15 @@ type APIServer struct {
200201

201202
// extraVolumes is an extra set of host volumes, mounted to the control plane component.
202203
// +optional
204+
// +listType=atomic
203205
// +kubebuilder:validation:MaxItems=100
204206
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
205207

206208
// extraEnvs is an extra set of environment variables to pass to the control plane component.
207209
// Environment variables passed using ExtraEnvs will override any existing environment variables, or *_proxy environment variables that kubeadm adds by default.
208210
// This option takes effect only on Kubernetes >=1.31.0.
209211
// +optional
212+
// +listType=atomic
210213
// +kubebuilder:validation:MaxItems=100
211214
ExtraEnvs []EnvVar `json:"extraEnvs,omitempty"`
212215

@@ -236,13 +239,15 @@ type ControllerManager struct {
236239

237240
// extraVolumes is an extra set of host volumes, mounted to the control plane component.
238241
// +optional
242+
// +listType=atomic
239243
// +kubebuilder:validation:MaxItems=100
240244
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
241245

242246
// extraEnvs is an extra set of environment variables to pass to the control plane component.
243247
// Environment variables passed using ExtraEnvs will override any existing environment variables, or *_proxy environment variables that kubeadm adds by default.
244248
// This option takes effect only on Kubernetes >=1.31.0.
245249
// +optional
250+
// +listType=atomic
246251
// +kubebuilder:validation:MaxItems=100
247252
ExtraEnvs []EnvVar `json:"extraEnvs,omitempty"`
248253
}
@@ -264,13 +269,15 @@ type Scheduler struct {
264269

265270
// extraVolumes is an extra set of host volumes, mounted to the control plane component.
266271
// +optional
272+
// +listType=atomic
267273
// +kubebuilder:validation:MaxItems=100
268274
ExtraVolumes []HostPathMount `json:"extraVolumes,omitempty"`
269275

270276
// extraEnvs is an extra set of environment variables to pass to the control plane component.
271277
// Environment variables passed using ExtraEnvs will override any existing environment variables, or *_proxy environment variables that kubeadm adds by default.
272278
// This option takes effect only on Kubernetes >=1.31.0.
273279
// +optional
280+
// +listType=atomic
274281
// +kubebuilder:validation:MaxItems=100
275282
ExtraEnvs []EnvVar `json:"extraEnvs,omitempty"`
276283
}
@@ -466,6 +473,7 @@ type LocalEtcd struct {
466473
// Environment variables passed using ExtraEnvs will override any existing environment variables, or *_proxy environment variables that kubeadm adds by default.
467474
// This option takes effect only on Kubernetes >=1.31.0.
468475
// +optional
476+
// +listType=atomic
469477
// +kubebuilder:validation:MaxItems=100
470478
ExtraEnvs []EnvVar `json:"extraEnvs,omitempty"`
471479

@@ -768,6 +776,7 @@ type KubeConfigAuthExec struct {
768776
// are unioned with the host's environment, as well as variables client-go uses
769777
// to pass argument to the plugin.
770778
// +optional
779+
// +listType=atomic
771780
// +kubebuilder:validation:MaxItems=100
772781
Env []KubeConfigAuthExecEnv `json:"env,omitempty"`
773782

api/bootstrap/kubeadm/v1beta2/kubeadmconfig_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ type KubeadmConfigSpec struct {
6666

6767
// files specifies extra files to be passed to user_data upon creation.
6868
// +optional
69+
// +listType=atomic
6970
// +kubebuilder:validation:MaxItems=200
7071
Files []File `json:"files,omitempty"`
7172

@@ -75,6 +76,7 @@ type KubeadmConfigSpec struct {
7576

7677
// mounts specifies a list of mount points to be setup.
7778
// +optional
79+
// +listType=atomic
7880
// +kubebuilder:validation:MaxItems=100
7981
Mounts []MountPoints `json:"mounts,omitempty"`
8082

@@ -110,6 +112,7 @@ type KubeadmConfigSpec struct {
110112

111113
// users specifies extra users to add
112114
// +optional
115+
// +listType=atomic
113116
// +kubebuilder:validation:MaxItems=100
114117
Users []User `json:"users,omitempty"`
115118

@@ -795,11 +798,13 @@ type NTP struct {
795798
type DiskSetup struct {
796799
// partitions specifies the list of the partitions to setup.
797800
// +optional
801+
// +listType=atomic
798802
// +kubebuilder:validation:MaxItems=100
799803
Partitions []Partition `json:"partitions,omitempty"`
800804

801805
// filesystems specifies the list of file systems to setup.
802806
// +optional
807+
// +listType=atomic
803808
// +kubebuilder:validation:MaxItems=100
804809
Filesystems []Filesystem `json:"filesystems,omitempty"`
805810
}

0 commit comments

Comments
 (0)