clean-ups the code around defaulting oidc

kyma-project · Sep 24, 2024 · 81be84e · 81be84e
1 parent 75771f8
commit 81be84e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 86 deletions.
diff --git a/internal/controller/runtime/fsm/runtime_fsm_configure_oidc.go b/internal/controller/runtime/fsm/runtime_fsm_configure_oidc.go
@@ -19,12 +19,23 @@ func DefaultAdditionalOidcIfNotPresent(runtime *imv1.Runtime, cfg RCCfg) {
 
 	if nil == additionalOidcConfig {
 		additionalOidcConfig = &[]gardener.OIDCConfig{}
-		defaultOIDCConfig := shoot.CreateDefaultOIDCConfig(cfg.Kubernetes.DefaultSharedIASTenant)
+		defaultOIDCConfig := CreateDefaultOIDCConfig(cfg.Kubernetes.DefaultSharedIASTenant)
 		*additionalOidcConfig = append(*additionalOidcConfig, defaultOIDCConfig)
 		runtime.Spec.Shoot.Kubernetes.KubeAPIServer.AdditionalOidcConfig = additionalOidcConfig
 	}
 }
 
+func CreateDefaultOIDCConfig(defaultSharedIASTenant shoot.OidcProvider) gardener.OIDCConfig {
+	return gardener.OIDCConfig{
+		ClientID:       &defaultSharedIASTenant.ClientID,
+		GroupsClaim:    &defaultSharedIASTenant.GroupsClaim,
+		IssuerURL:      &defaultSharedIASTenant.IssuerURL,
+		SigningAlgs:    defaultSharedIASTenant.SigningAlgs,
+		UsernameClaim:  &defaultSharedIASTenant.UsernameClaim,
+		UsernamePrefix: &defaultSharedIASTenant.UsernamePrefix,
+	}
+}
+
 func sFnConfigureOidc(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.Result, error) {
 	m.log.Info("Configure OIDC state")
 

diff --git a/internal/gardener/shoot/extender/oidc.go b/internal/gardener/shoot/extender/oidc.go
@@ -21,7 +21,6 @@ func NewOidcExtender(clientId, groupsClaim, issuerURL, usernameClaim, usernamePr
 		}
 
 		oidcConfig := runtime.Spec.Shoot.Kubernetes.KubeAPIServer.OidcConfig
-
 		if ShouldDefaultOidcConfig(oidcConfig) {
 			oidcConfig = gardener.OIDCConfig{
 				ClientID:       &clientId,
@@ -32,13 +31,11 @@ func NewOidcExtender(clientId, groupsClaim, issuerURL, usernameClaim, usernamePr
 				UsernamePrefix: &usernamePrefix,
 			}
 		}
-
 		setKubeAPIServerOIDCConfig(shoot, oidcConfig)
 
 		return nil
 	}
 }
-
 func CanEnableExtension(runtime imv1.Runtime) bool {
 	canEnable := true
 	createdByMigrator := runtime.Labels["operator.kyma-project.io/created-by-migrator"]

diff --git a/internal/gardener/shoot/oidc_defaulter.go b/internal/gardener/shoot/oidc_defaulter.go
diff --git a/internal/gardener/shoot/oidc_defaulter_test.go b/internal/gardener/shoot/oidc_defaulter_test.go