Merge branch 'main' into fix-oidc-extension-for-updated-clusters

kyma-project · Nov 28, 2024 · cff6295 · cff6295
2 parents b87ae3c + ef44cc6
commit cff6295
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/internal/controller/runtime/fsm/runtime_fsm_create_kubeconfig.go b/internal/controller/runtime/fsm/runtime_fsm_create_kubeconfig.go
@@ -16,7 +16,7 @@ const (
 	kubeconfigSecretKey = "config"
 )
 
-func sFnCreateKubeconfig(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.Result, error) {
+func sFnHandleKubeconfig(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.Result, error) {
 	m.log.Info("Create Gardener Cluster CR state")
 
 	runtimeID := s.instance.Labels[imv1.LabelKymaRuntimeID]

diff --git a/internal/controller/runtime/fsm/runtime_fsm_create_kubeconfig_test.go b/internal/controller/runtime/fsm/runtime_fsm_create_kubeconfig_test.go
@@ -73,7 +73,7 @@ var _ = Describe("KIM sFnCreateKubeconfig", func() {
 		},
 	}
 
-	testFunction := buildTestFunction(sFnCreateKubeconfig)
+	testFunction := buildTestFunction(sFnHandleKubeconfig)
 
 	// WHEN/THAN
 

diff --git a/internal/controller/runtime/fsm/runtime_fsm_patch_shoot.go b/internal/controller/runtime/fsm/runtime_fsm_patch_shoot.go
@@ -74,7 +74,7 @@ func sFnPatchExistingShoot(ctx context.Context, m *fsm, s *systemState) (stateFn
 
 	if updatedShoot.Generation == s.shoot.Generation {
 		m.log.Info("Gardener shoot for runtime did not change after patch, moving to processing", "Name", s.shoot.Name, "Namespace", s.shoot.Namespace)
-		return switchState(sFnConfigureOidc)
+		return switchState(sFnHandleKubeconfig)
 	}
 
 	m.log.Info("Gardener shoot for runtime patched successfully", "Name", s.shoot.Name, "Namespace", s.shoot.Namespace)

diff --git a/internal/controller/runtime/fsm/runtime_fsm_waiting_for_shoot_reconcile.go b/internal/controller/runtime/fsm/runtime_fsm_waiting_for_shoot_reconcile.go
@@ -58,7 +58,7 @@ func sFnWaitForShootReconcile(_ context.Context, m *fsm, s *systemState) (stateF
 			imv1.ConditionTypeRuntimeProvisioned,
 			imv1.ConditionReasonConfigurationCompleted,
 			"Runtime processing completed successfully",
-			sFnConfigureOidc)
+			sFnHandleKubeconfig)
 	}
 
 	m.log.Info("sFnWaitForShootReconcile - unknown shoot operation state, stopping state machine", "RuntimeCR", s.instance.Name, "shoot", s.shoot.Name)

diff --git a/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go b/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go
@@ -74,7 +74,7 @@ func sFnWaitForShootCreation(_ context.Context, m *fsm, s *systemState) (stateFn
 			imv1.ConditionTypeRuntimeProvisioned,
 			imv1.ConditionReasonShootCreationCompleted,
 			"Shoot creation completed",
-			sFnCreateKubeconfig)
+			sFnHandleKubeconfig)
 
 	default:
 		m.log.Info("WaitForShootCreation - unknown shoot operation state, stopping state machine", "RuntimeCR", s.instance.Name, "shoot", s.shoot.Name)
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ var _ = Describe("KIM sFnCreateKubeconfig", func() { @@
     		},
     	}
-    	testFunction := buildTestFunction(sFnCreateKubeconfig)
+    	testFunction := buildTestFunction(sFnHandleKubeconfig)
     	// WHEN/THAN
@@ Expand Down @@