✨ Allow to disable KubeProxy and CoreDNS

See #12288

Author: sathieu

api/bootstrap/kubeadm/v1beta1/kubeadm_types.go

@@ -159,6 +159,9 @@ type ClusterConfiguration struct {
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=63
 	ClusterName string `json:"clusterName,omitempty"`
+
+	// Proxy defines the options for the proxy add-on installed in the cluster.
+	Proxy Proxy `json:"proxy,omitempty"`
 }
 
 // ControlPlaneComponent holds settings common to control plane component of the cluster.
@@ -201,6 +204,15 @@ type APIServer struct {
 type DNS struct {
 	// ImageMeta allows to customize the image used for the DNS component
 	ImageMeta `json:",inline"`
+
+	// Disabled specifies whether to disable this addon in the cluster
+	Disabled bool `json:"disabled,omitempty"`
+}
+
+// Proxy defines the proxy addon that should be used in the cluster
+type Proxy struct {
+	// Disabled specifies whether to disable this addon in the cluster
+	Disabled bool `json:"disabled,omitempty"`
 }
 
 // ImageMeta allows to customize the image used for components that are not

api/bootstrap/kubeadm/v1beta1/zz_generated.conversion.go

@@ -164,6 +164,9 @@ type ClusterConfiguration struct {
 	// featureGates enabled by the user.
 	// +optional
 	FeatureGates map[string]bool `json:"featureGates,omitempty"`
+
+	// Proxy defines the options for the proxy add-on installed in the cluster.
+	Proxy Proxy `json:"proxy,omitempty"`
 }
 
 // ControlPlaneComponent holds settings common to control plane component of the cluster.
@@ -209,6 +212,15 @@ type APIServer struct {
 type DNS struct {
 	// ImageMeta allows to customize the image used for the DNS component
 	ImageMeta `json:",inline"`
+
+	// Disabled specifies whether to disable this addon in the cluster
+	Disabled bool `json:"disabled,omitempty"`
+}
+
+// Proxy defines the proxy addon that should be used in the cluster
+type Proxy struct {
+	// Disabled specifies whether to disable this addon in the cluster
+	Disabled bool `json:"disabled,omitempty"`
 }
 
 // ImageMeta allows to customize the image used for components that are not

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -59,6 +59,16 @@ func (dst *JoinConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 
 // Custom conversion from this API, kubeadm v1beta3, to the hub version, CABPK v1beta1.
 
+func Convert_v1beta2_ClusterConfiguration_To_upstreamv1beta3_ClusterConfiguration(in *bootstrapv1.ClusterConfiguration, out *ClusterConfiguration, s apimachineryconversion.Scope) error {
+	// v1beta3 has no ClusterConfiguration.Proxy
+	return autoConvert_v1beta2_ClusterConfiguration_To_upstreamv1beta3_ClusterConfiguration(in, out, s)
+}
+
+func Convert_v1beta2_DNS_To_upstreamv1beta3_DNS(in *bootstrapv1.DNS, out *DNS, s apimachineryconversion.Scope) error {
+	// v1beta3 has no ClusterConfiguration.DNS.Disabled
+	return autoConvert_v1beta2_DNS_To_upstreamv1beta3_DNS(in, out, s)
+}
+
 func Convert_upstreamv1beta3_ClusterConfiguration_To_v1beta2_ClusterConfiguration(in *ClusterConfiguration, out *bootstrapv1.ClusterConfiguration, s apimachineryconversion.Scope) error {
 	return autoConvert_upstreamv1beta3_ClusterConfiguration_To_v1beta2_ClusterConfiguration(in, out, s)
 }

api/bootstrap/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -188,6 +188,38 @@ func TestMarshalClusterConfigurationForVersion(t *testing.T) {
 				"scheduler: {}\n",
 			wantErr: false,
 		},
+		{
+			name: "Allow to disable DNS or Proxy",
+			args: args{
+				capiObj: &bootstrapv1.ClusterConfiguration{
+					DNS: bootstrapv1.DNS{
+						Disabled: true,
+					},
+					Proxy: bootstrapv1.Proxy{
+						Disabled: true,
+					},
+				},
+				version: semver.MustParse("1.31.0"),
+			},
+			want: "apiServer: {}\n" +
+				"apiVersion: kubeadm.k8s.io/v1beta4\n" +
+				"clusterName: mycluster\n" +
+				"controlPlaneEndpoint: myControlPlaneEndpoint:6443\n" +
+				"controllerManager: {}\n" +
+				"dns:\n" +
+				"  disabled: true\n" +
+				"etcd: {}\n" +
+				"kind: ClusterConfiguration\n" +
+				"kubernetesVersion: v1.31.0\n" +
+				"networking:\n" +
+				"  dnsDomain: myDNSDomain\n" +
+				"  podSubnet: myPodSubnet\n" +
+				"  serviceSubnet: myServiceSubnet\n" +
+				"proxy:\n" +
+				"  disabled: true\n" +
+				"scheduler: {}\n",
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {