Minor fixes (gardener#8878)

* Do not default KubeControllerManager struct for workerless * Fix spelling in doc string
JordanJordanov · Nov 29, 2023 · ccb71cb · ccb71cb
1 parent ba208a4
commit ccb71cb
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/docs/api-reference/settings.md b/docs/api-reference/settings.md
@@ -183,7 +183,7 @@ KubeAPIServerOpenIDConnect
 </td>
 <td>
 <p>Server contains the kube-apiserver&rsquo;s OpenID Connect configuration.
-This configuration is not overwritting any existing OpenID Connect
+This configuration is not overwriting any existing OpenID Connect
 configuration already set on the Shoot object.</p>
 </td>
 </tr>
@@ -200,7 +200,7 @@ OpenIDConnectClientAuthentication
 <em>(Optional)</em>
 <p>Client contains the configuration used for client OIDC authentication
 of Shoot clusters.
-This configuration is not overwritting any existing OpenID Connect
+This configuration is not overwriting any existing OpenID Connect
 client authentication already set on the Shoot object.</p>
 </td>
 </tr>
@@ -497,7 +497,7 @@ KubeAPIServerOpenIDConnect
 </td>
 <td>
 <p>Server contains the kube-apiserver&rsquo;s OpenID Connect configuration.
-This configuration is not overwritting any existing OpenID Connect
+This configuration is not overwriting any existing OpenID Connect
 configuration already set on the Shoot object.</p>
 </td>
 </tr>
@@ -514,7 +514,7 @@ OpenIDConnectClientAuthentication
 <em>(Optional)</em>
 <p>Client contains the configuration used for client OIDC authentication
 of Shoot clusters.
-This configuration is not overwritting any existing OpenID Connect
+This configuration is not overwriting any existing OpenID Connect
 client authentication already set on the Shoot object.</p>
 </td>
 </tr>

diff --git a/pkg/apis/core/v1beta1/defaults_shoot.go b/pkg/apis/core/v1beta1/defaults_shoot.go
@@ -32,9 +32,6 @@ func SetDefaults_Shoot(obj *Shoot) {
 	if obj.Spec.Kubernetes.KubeAPIServer == nil {
 		obj.Spec.Kubernetes.KubeAPIServer = &KubeAPIServerConfig{}
 	}
-	if obj.Spec.Kubernetes.KubeControllerManager == nil {
-		obj.Spec.Kubernetes.KubeControllerManager = &KubeControllerManagerConfig{}
-	}
 
 	if obj.Spec.Purpose == nil {
 		p := ShootPurposeEvaluation
@@ -97,6 +94,10 @@ func SetDefaults_Shoot(obj *Shoot) {
 			obj.Spec.Kubernetes.KubeAPIServer.DefaultUnreachableTolerationSeconds = pointer.Int64(300)
 		}
 
+		if obj.Spec.Kubernetes.KubeControllerManager == nil {
+			obj.Spec.Kubernetes.KubeControllerManager = &KubeControllerManagerConfig{}
+		}
+
 		if obj.Spec.Kubernetes.KubeControllerManager.NodeCIDRMaskSize == nil {
 			obj.Spec.Kubernetes.KubeControllerManager.NodeCIDRMaskSize = calculateDefaultNodeCIDRMaskSize(&obj.Spec)
 		}

diff --git a/pkg/apis/core/v1beta1/defaults_shoot_test.go b/pkg/apis/core/v1beta1/defaults_shoot_test.go
@@ -376,15 +376,17 @@ var _ = Describe("Shoot defaulting", func() {
 	})
 
 	Describe("KubeControllerManager settings defaulting", func() {
-		Describe("NodeCIDRMaskSize", func() {
-			It("should not default nodeCIDRMaskSize field for workerless Shoot", func() {
+		Describe("KubeControllerManager", func() {
+			It("should not default KubeControllerManager field for workerless Shoot", func() {
 				obj.Spec.Provider.Workers = nil
 
 				SetObjectDefaults_Shoot(obj)
 
-				Expect(obj.Spec.Kubernetes.KubeControllerManager.NodeCIDRMaskSize).To(BeNil())
+				Expect(obj.Spec.Kubernetes.KubeControllerManager).To(BeNil())
 			})
+		})
 
+		Describe("NodeCIDRMaskSize", func() {
 			Context("IPv4", func() {
 				It("should make nodeCIDRMaskSize big enough for 2*maxPods", func() {
 					obj.Spec.Provider.Workers = []Worker{{}}

diff --git a/pkg/apis/settings/types_shared.go b/pkg/apis/settings/types_shared.go
@@ -23,13 +23,13 @@ import (
 type OpenIDConnectPresetSpec struct {
 
 	// Server contains the kube-apiserver's OpenID Connect configuration.
-	// This configuration is not overwritting any existing OpenID Connect
+	// This configuration is not overwriting any existing OpenID Connect
 	// configuration already set on the Shoot object.
 	Server KubeAPIServerOpenIDConnect
 
 	// Client contains the configuration used for client OIDC authentication
 	// of Shoot clusters.
-	// This configuration is not overwritting any existing OpenID Connect
+	// This configuration is not overwriting any existing OpenID Connect
 	// client authentication already set on the Shoot object.
 	Client *OpenIDConnectClientAuthentication
 

diff --git a/pkg/apis/settings/v1alpha1/generated.proto b/pkg/apis/settings/v1alpha1/generated.proto
diff --git a/pkg/apis/settings/v1alpha1/types_shared.go b/pkg/apis/settings/v1alpha1/types_shared.go
@@ -30,13 +30,13 @@ const (
 type OpenIDConnectPresetSpec struct {
 
 	// Server contains the kube-apiserver's OpenID Connect configuration.
-	// This configuration is not overwritting any existing OpenID Connect
+	// This configuration is not overwriting any existing OpenID Connect
 	// configuration already set on the Shoot object.
 	Server KubeAPIServerOpenIDConnect `json:"server" protobuf:"bytes,1,opt,name=server"`
 
 	// Client contains the configuration used for client OIDC authentication
 	// of Shoot clusters.
-	// This configuration is not overwritting any existing OpenID Connect
+	// This configuration is not overwriting any existing OpenID Connect
 	// client authentication already set on the Shoot object.
 	// +optional
 	Client *OpenIDConnectClientAuthentication `json:"client,omitempty" protobuf:"bytes,2,opt,name=client"`

diff --git a/pkg/openapi/openapi_generated.go b/pkg/openapi/openapi_generated.go