From 8152ffd9d0a0faf330c0039deabc2940ff0d2277 Mon Sep 17 00:00:00 2001
From: Przemyslaw Golicz <przemyslaw.golicz@sap.com>
Date: Tue, 3 Sep 2024 14:32:42 +0200
Subject: [PATCH] enable oidc extension by default for newly provisioned
 clusters (#3467)

---
 .../internal/model/gardener_config.go         |  1 +
 .../internal/model/gardener_config_test.go    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/components/provisioner/internal/model/gardener_config.go b/components/provisioner/internal/model/gardener_config.go
index 3f8ccbfda6..aaa1a1d356 100644
--- a/components/provisioner/internal/model/gardener_config.go
+++ b/components/provisioner/internal/model/gardener_config.go
@@ -211,6 +211,7 @@ func (c GardenerConfig) ToShootTemplate(namespace string, accountId string, subA
 				{Type: "shoot-dns-service", ProviderConfig: &apimachineryRuntime.RawExtension{Raw: jsonDNSConfig}},
 				{Type: "shoot-cert-service", ProviderConfig: &apimachineryRuntime.RawExtension{Raw: jsonCertConfig}},
 				{Type: ShootNetworkingFilterExtensionType, Disabled: util.OkOrDefault(c.ShootNetworkingFilterDisabled, util.PtrTo(ShootNetworkingFilterDisabledDefault))},
+				{Type: "shoot-oidc-service", Disabled: util.PtrTo(false)},
 			},
 			ControlPlane: controlPlane,
 		},
diff --git a/components/provisioner/internal/model/gardener_config_test.go b/components/provisioner/internal/model/gardener_config_test.go
index ae038875ea..b602490334 100644
--- a/components/provisioner/internal/model/gardener_config_test.go
+++ b/components/provisioner/internal/model/gardener_config_test.go
@@ -243,6 +243,10 @@ func TestGardenerConfig_ToShootTemplate(t *testing.T) {
 							Type:     ShootNetworkingFilterExtensionType,
 							Disabled: util.PtrTo(true),
 						},
+						{
+							Type:     "shoot-oidc-service",
+							Disabled: util.PtrTo(false),
+						},
 					},
 					ControlPlane: &gardener_types.ControlPlane{
 						HighAvailability: &gardener_types.HighAvailability{
@@ -328,6 +332,10 @@ func TestGardenerConfig_ToShootTemplate(t *testing.T) {
 							Type:     ShootNetworkingFilterExtensionType,
 							Disabled: util.PtrTo(true),
 						},
+						{
+							Type:     "shoot-oidc-service",
+							Disabled: util.PtrTo(false),
+						},
 					},
 					ControlPlane: &gardener_types.ControlPlane{
 						HighAvailability: &gardener_types.HighAvailability{
@@ -413,6 +421,10 @@ func TestGardenerConfig_ToShootTemplate(t *testing.T) {
 							Type:     ShootNetworkingFilterExtensionType,
 							Disabled: util.PtrTo(true),
 						},
+						{
+							Type:     "shoot-oidc-service",
+							Disabled: util.PtrTo(false),
+						},
 					},
 					ControlPlane: &gardener_types.ControlPlane{
 						HighAvailability: &gardener_types.HighAvailability{
@@ -498,6 +510,10 @@ func TestGardenerConfig_ToShootTemplate(t *testing.T) {
 							Type:     ShootNetworkingFilterExtensionType,
 							Disabled: util.PtrTo(true),
 						},
+						{
+							Type:     "shoot-oidc-service",
+							Disabled: util.PtrTo(false),
+						},
 					},
 					ControlPlane: &gardener_types.ControlPlane{
 						HighAvailability: &gardener_types.HighAvailability{
@@ -585,6 +601,10 @@ func TestGardenerConfig_ToShootTemplate(t *testing.T) {
 							Type:     ShootNetworkingFilterExtensionType,
 							Disabled: util.PtrTo(true),
 						},
+						{
+							Type:     "shoot-oidc-service",
+							Disabled: util.PtrTo(false),
+						},
 					},
 					ControlPlane: &gardener_types.ControlPlane{
 						HighAvailability: &gardener_types.HighAvailability{