Skip to content

Commit 8996546

Browse files
authored
Merge pull request #12019 from sbueringer/pr-fix-kubeadmconfig
🐛 Make KubeadmConfig FileSystem.Label optional
2 parents bf3b1a3 + 84066fb commit 8996546

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,31 +805,37 @@ type Filesystem struct {
805805
// +kubebuilder:validation:MinLength=1
806806
// +kubebuilder:validation:MaxLength=256
807807
Device string `json:"device"`
808+
808809
// filesystem specifies the file system type.
809810
// +required
810811
// +kubebuilder:validation:MinLength=1
811812
// +kubebuilder:validation:MaxLength=128
812813
Filesystem string `json:"filesystem"`
814+
813815
// label specifies the file system label to be used. If set to None, no label is used.
814-
// +required
816+
// +optional
815817
// +kubebuilder:validation:MinLength=1
816818
// +kubebuilder:validation:MaxLength=512
817-
Label string `json:"label"`
819+
Label string `json:"label,omitempty"`
820+
818821
// partition specifies the partition to use. The valid options are: "auto|any", "auto", "any", "none", and <NUM>, where NUM is the actual partition number.
819822
// +optional
820823
// +kubebuilder:validation:MinLength=1
821824
// +kubebuilder:validation:MaxLength=128
822825
Partition *string `json:"partition,omitempty"`
826+
823827
// overwrite defines whether or not to overwrite any existing filesystem.
824828
// If true, any pre-existing file system will be destroyed. Use with Caution.
825829
// +optional
826830
Overwrite *bool `json:"overwrite,omitempty"`
831+
827832
// replaceFS is a special directive, used for Microsoft Azure that instructs cloud-init to replace a file system of <FS_TYPE>.
828833
// NOTE: unless you define a label, this requires the use of the 'any' partition directive.
829834
// +optional
830835
// +kubebuilder:validation:MinLength=1
831836
// +kubebuilder:validation:MaxLength=128
832837
ReplaceFS *string `json:"replaceFS,omitempty"`
838+
833839
// extraOpts defined extra options to add to the command for creating the file system.
834840
// +optional
835841
// +kubebuilder:validation:MaxItems=100

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

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

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

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

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml

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

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml

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

0 commit comments

Comments
 (0)