support NodeRegistrationOptions.IgnorePreflightErrors

Signed-off-by: Stefan Büringer [email protected]

bootstrap/kubeadm/api/v1alpha3/conversion.go

@@ -90,3 +90,23 @@ func Convert_v1beta1_ClusterConfiguration_To_v1alpha4_ClusterConfiguration(in *k
 	// ClusterConfiguration.UseHyperKubeImage was removed in kubeadm v1alpha4 API
 	return kubeadmbootstrapv1beta1.Convert_v1beta1_ClusterConfiguration_To_v1alpha4_ClusterConfiguration(in, out, s)
 }
+
+func Convert_v1alpha4_InitConfiguration_To_v1beta1_InitConfiguration(in *kubeadmbootstrapv1alpha4.InitConfiguration, out *kubeadmbootstrapv1beta1.InitConfiguration, s apiconversion.Scope) error {
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	return kubeadmbootstrapv1beta1.Convert_v1alpha4_InitConfiguration_To_v1beta1_InitConfiguration(in, out, s)
+}
+
+func Convert_v1beta1_InitConfiguration_To_v1alpha4_InitConfiguration(in *kubeadmbootstrapv1beta1.InitConfiguration, out *kubeadmbootstrapv1alpha4.InitConfiguration, s apiconversion.Scope) error {
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	return kubeadmbootstrapv1beta1.Convert_v1beta1_InitConfiguration_To_v1alpha4_InitConfiguration(in, out, s)
+}
+
+func Convert_v1alpha4_JoinConfiguration_To_v1beta1_JoinConfiguration(in *kubeadmbootstrapv1alpha4.JoinConfiguration, out *kubeadmbootstrapv1beta1.JoinConfiguration, s apiconversion.Scope) error {
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	return kubeadmbootstrapv1beta1.Convert_v1alpha4_JoinConfiguration_To_v1beta1_JoinConfiguration(in, out, s)
+}
+
+func Convert_v1beta1_JoinConfiguration_To_v1alpha4_JoinConfiguration(in *kubeadmbootstrapv1beta1.JoinConfiguration, out *kubeadmbootstrapv1alpha4.JoinConfiguration, s apiconversion.Scope) error {
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	return kubeadmbootstrapv1beta1.Convert_v1beta1_JoinConfiguration_To_v1alpha4_JoinConfiguration(in, out, s)
+}

bootstrap/kubeadm/api/v1alpha3/conversion_test.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
+	kubeadmbootstrapv1alpha4 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
 	"sigs.k8s.io/cluster-api/bootstrap/kubeadm/types/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
@@ -45,6 +46,7 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 		KubeadmConfigStatusFuzzer,
 		dnsFuzzer,
 		clusterConfigurationFuzzer,
+		kubeadmNodeRegistrationOptionsFuzzer,
 	}
 }
 
@@ -68,3 +70,11 @@ func clusterConfigurationFuzzer(obj *v1beta1.ClusterConfiguration, c fuzz.Contin
 	// ClusterConfiguration.UseHyperKubeImage has been removed in v1alpha4, so setting it to false in order to avoid v1beta1 --> v1alpha4 --> v1beta1 round trip errors.
 	obj.UseHyperKubeImage = false
 }
+
+func kubeadmNodeRegistrationOptionsFuzzer(obj *kubeadmbootstrapv1alpha4.NodeRegistrationOptions, c fuzz.Continue) {
+	c.FuzzNoCustom(obj)
+
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
+	// v1alpha4 --> v1beta1 -> v1alpha4 round trip errors.
+	obj.IgnorePreflightErrors = nil
+}

bootstrap/kubeadm/api/v1alpha4/kubeadm_types.go

@@ -225,6 +225,10 @@ type NodeRegistrationOptions struct {
 	// Flags have higher priority when parsing. These values are local and specific to the node kubeadm is executing on.
 	// +optional
 	KubeletExtraArgs map[string]string `json:"kubeletExtraArgs,omitempty"`
+
+	// IgnorePreflightErrors provides a slice of pre-flight errors to be ignored when the current node is registered.
+	// +optional
+	IgnorePreflightErrors []string `json:"ignorePreflightErrors,omitempty"`
 }
 
 // Networking contains elements describing cluster's networking configuration.

bootstrap/kubeadm/types/utils_test.go

@@ -162,6 +162,22 @@ func TestMarshalClusterConfigurationForVersion(t *testing.T) {
 				"scheduler: {}\n",
 			wantErr: false,
 		},
+		{
+			name: "Generates a v1beta3 kubeadm configuration",
+			args: args{
+				capiObj: &bootstrapv1.ClusterConfiguration{},
+				version: semver.MustParse("1.22.0"),
+			},
+			want: "apiServer: {}\n" +
+				"apiVersion: kubeadm.k8s.io/v1beta3\n" + "" +
+				"controllerManager: {}\n" +
+				"dns: {}\n" +
+				"etcd: {}\n" +
+				"kind: ClusterConfiguration\n" +
+				"networking: {}\n" +
+				"scheduler: {}\n",
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -211,6 +227,14 @@ func TestMarshalClusterStatusForVersion(t *testing.T) {
 				"kind: ClusterStatus\n",
 			wantErr: false,
 		},
+		{
+			name: "Fails generating a v1beta3 kubeadm status",
+			args: args{
+				capiObj: &bootstrapv1.ClusterStatus{},
+				version: semver.MustParse("1.22.0"),
+			},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -255,13 +279,38 @@ func TestMarshalInitConfigurationForVersion(t *testing.T) {
 		{
 			name: "Generates a v1beta2 kubeadm configuration",
 			args: args{
-				capiObj: &bootstrapv1.InitConfiguration{},
+				capiObj: &bootstrapv1.InitConfiguration{
+					NodeRegistration: bootstrapv1.NodeRegistrationOptions{
+						IgnorePreflightErrors: []string{"some-preflight-check"},
+					},
+				},
 				version: semver.MustParse("1.15.0"),
 			},
 			want: "apiVersion: kubeadm.k8s.io/v1beta2\n" +
 				"kind: InitConfiguration\n" +
 				"localAPIEndpoint: {}\n" +
-				"nodeRegistration: {}\n",
+				"nodeRegistration:\n" +
+				"  ignorePreflightErrors:\n" +
+				"  - some-preflight-check\n",
+			wantErr: false,
+		},
+		{
+			name: "Generates a v1beta3 kubeadm configuration",
+			args: args{
+				capiObj: &bootstrapv1.InitConfiguration{
+					NodeRegistration: bootstrapv1.NodeRegistrationOptions{
+						IgnorePreflightErrors: []string{"some-preflight-check"},
+					},
+				},
+				version: semver.MustParse("1.22.0"),
+			},
+			want: "apiVersion: kubeadm.k8s.io/v1beta3\n" +
+				"kind: InitConfiguration\n" +
+				"localAPIEndpoint: {}\n" +
+				"nodeRegistration:\n" +
+				"  ignorePreflightErrors:\n" +
+				"  - some-preflight-check\n" +
+				"  taints: null\n",
 			wantErr: false,
 		},
 	}
@@ -306,13 +355,38 @@ func TestMarshalJoinConfigurationForVersion(t *testing.T) {
 		{
 			name: "Generates a v1beta2 kubeadm configuration",
 			args: args{
-				capiObj: &bootstrapv1.JoinConfiguration{},
+				capiObj: &bootstrapv1.JoinConfiguration{
+					NodeRegistration: bootstrapv1.NodeRegistrationOptions{
+						IgnorePreflightErrors: []string{"some-preflight-check"},
+					},
+				},
 				version: semver.MustParse("1.15.0"),
 			},
 			want: "apiVersion: kubeadm.k8s.io/v1beta2\n" + "" +
 				"discovery: {}\n" +
 				"kind: JoinConfiguration\n" +
-				"nodeRegistration: {}\n",
+				"nodeRegistration:\n" +
+				"  ignorePreflightErrors:\n" +
+				"  - some-preflight-check\n",
+			wantErr: false,
+		},
+		{
+			name: "Generates a v1beta3 kubeadm configuration",
+			args: args{
+				capiObj: &bootstrapv1.JoinConfiguration{
+					NodeRegistration: bootstrapv1.NodeRegistrationOptions{
+						IgnorePreflightErrors: []string{"some-preflight-check"},
+					},
+				},
+				version: semver.MustParse("1.22.0"),
+			},
+			want: "apiVersion: kubeadm.k8s.io/v1beta3\n" + "" +
+				"discovery: {}\n" +
+				"kind: JoinConfiguration\n" +
+				"nodeRegistration:\n" +
+				"  ignorePreflightErrors:\n" +
+				"  - some-preflight-check\n" +
+				"  taints: null\n",
 			wantErr: false,
 		},
 	}
@@ -371,6 +445,21 @@ func TestUnmarshalClusterConfiguration(t *testing.T) {
 			want:    &bootstrapv1.ClusterConfiguration{},
 			wantErr: false,
 		},
+		{
+			name: "Parses a v1beta3 kubeadm configuration",
+			args: args{
+				yaml: "apiServer: {}\n" +
+					"apiVersion: kubeadm.k8s.io/v1beta3\n" + "" +
+					"controllerManager: {}\n" +
+					"dns: {}\n" +
+					"etcd: {}\n" +
+					"kind: ClusterConfiguration\n" +
+					"networking: {}\n" +
+					"scheduler: {}\n",
+			},
+			want:    &bootstrapv1.ClusterConfiguration{},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -417,6 +506,15 @@ func TestUnmarshalClusterStatus(t *testing.T) {
 			want:    &bootstrapv1.ClusterStatus{},
 			wantErr: false,
 		},
+		{
+			name: "Fails parsing a v1beta3 kubeadm configuration",
+			args: args{
+				yaml: "apiEndpoints: null\n" +
+					"apiVersion: kubeadm.k8s.io/v1beta3\n" + "" +
+					"kind: ClusterStatus\n",
+			},
+			wantErr: true,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

bootstrap/kubeadm/types/v1beta1/conversion.go

@@ -19,6 +19,7 @@ package v1beta1
 import (
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
+	v1alpha4 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -79,3 +80,8 @@ func Convert_v1beta1_ClusterConfiguration_To_v1alpha4_ClusterConfiguration(in *C
 	// ClusterConfiguration.UseHyperKubeImage was removed in kubeadm v1alpha4 API
 	return autoConvert_v1beta1_ClusterConfiguration_To_v1alpha4_ClusterConfiguration(in, out, s)
 }
+
+func Convert_v1alpha4_NodeRegistrationOptions_To_v1beta1_NodeRegistrationOptions(in *v1alpha4.NodeRegistrationOptions, out *NodeRegistrationOptions, s apimachineryconversion.Scope) error {
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API
+	return autoConvert_v1alpha4_NodeRegistrationOptions_To_v1beta1_NodeRegistrationOptions(in, out, s)
+}

bootstrap/kubeadm/types/v1beta1/conversion_test.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
+	kubeadmbootstrapv1alpha4 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
@@ -61,6 +62,7 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		dnsFuzzer,
 		clusterConfigurationFuzzer,
+		kubeadmNodeRegistrationOptionsFuzzer,
 	}
 }
 
@@ -77,3 +79,11 @@ func clusterConfigurationFuzzer(obj *ClusterConfiguration, c fuzz.Continue) {
 	// ClusterConfiguration.UseHyperKubeImage has been removed in v1alpha4, so setting it to false in order to avoid v1beta1 --> v1alpha4 --> v1beta1 round trip errors.
 	obj.UseHyperKubeImage = false
 }
+
+func kubeadmNodeRegistrationOptionsFuzzer(obj *kubeadmbootstrapv1alpha4.NodeRegistrationOptions, c fuzz.Continue) {
+	c.FuzzNoCustom(obj)
+
+	// NodeRegistrationOptions.IgnorePreflightErrors does not exist in kubeadm v1beta1 API, so setting it to nil in order to avoid
+	// v1alpha4 --> v1beta1 -> v1alpha4 round trip errors.
+	obj.IgnorePreflightErrors = nil
+}