Block settings for provider id and cloud provider

aws · Jun 10, 2024 · 92bceac · 92bceac
1 parent 560fbf4
commit 92bceac
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/pkg/api/v1alpha1/cluster.go b/pkg/api/v1alpha1/cluster.go
@@ -576,6 +576,10 @@ func validateKubeletConfiguration(eksakubeconfig *unstructured.Unstructured) err
 		return fmt.Errorf("unmarshaling KubeletConfiguration for %v", err)
 	}
 
+	if _, ok := eksakubeconfig.Object["providerID"]; ok {
+		return errors.New("can not override providerID and cloudProvider (set by EKS Anywhere)")
+	}
+
 	return nil
 }
 

diff --git a/pkg/api/v1alpha1/cluster_test.go b/pkg/api/v1alpha1/cluster_test.go
@@ -1177,7 +1177,7 @@ func TestValidateClusterConfigContent(t *testing.T) {
 				}
 				c.Spec.WorkerNodeGroupConfigurations[0].KubeletConfiguration = &unstructured.Unstructured{
 					Object: map[string]interface{}{
-						"maxPods":    20,
+						"maxPods":    25,
 						"apiVersion": "kubelet.config.k8s.io/v1beta1",
 						"kind":       "KubeletConfiguration",
 					},
@@ -1213,6 +1213,52 @@ func TestValidateClusterConfigContent(t *testing.T) {
 			wantErr: true,
 			err:     "unknown field",
 		},
+		{
+			testName: "providerid error",
+			cluster: baseCluster(func(c *Cluster) {
+				c.Spec.WorkerNodeGroupConfigurations[0].KubeletConfiguration = &unstructured.Unstructured{
+					Object: map[string]interface{}{
+						"maxPods":    20,
+						"apiVersion": "kubelet.config.k8s.io/v1beta1",
+						"kind":       "KubeletConfiguration",
+						"providerID": "provider id",
+					},
+				}
+				c.Spec.ControlPlaneConfiguration.KubeletConfiguration = &unstructured.Unstructured{
+					Object: map[string]interface{}{
+						"maxPods":    20,
+						"apiVersion": "kubelet.config.k8s.io/v1beta1",
+						"kind":       "KubeletConfiguration",
+						"providerID": "provider id",
+					},
+				}
+			}),
+			wantErr: true,
+			err:     "can not override providerID and cloudProvider",
+		},
+		{
+			testName: "providerid error",
+			cluster: baseCluster(func(c *Cluster) {
+				c.Spec.WorkerNodeGroupConfigurations[0].KubeletConfiguration = &unstructured.Unstructured{
+					Object: map[string]interface{}{
+						"maxPods":       20,
+						"apiVersion":    "kubelet.config.k8s.io/v1beta1",
+						"kind":          "KubeletConfiguration",
+						"cloudProvider": "external",
+					},
+				}
+				c.Spec.ControlPlaneConfiguration.KubeletConfiguration = &unstructured.Unstructured{
+					Object: map[string]interface{}{
+						"maxPods":       20,
+						"apiVersion":    "kubelet.config.k8s.io/v1beta1",
+						"kind":          "KubeletConfiguration",
+						"cloudProvider": "external",
+					},
+				}
+			}),
+			wantErr: true,
+			err:     "unknown field \"cloudProvider\"",
+		},
 	}
 
 	for _, tt := range tests {