adapt cilium and e2e tests to gardener v1.90.0

gardener · Mar 7, 2024 · 5295077 · 5295077
1 parent a967d3b
commit 5295077
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/pkg/controller/actuator_reconcile.go b/pkg/controller/actuator_reconcile.go
@@ -110,6 +110,7 @@ func (a *actuator) Reconcile(ctx context.Context, _ logr.Logger, network *extens
 			ShootWebhooksResourceName,
 			*webhookConfig,
 			cluster,
+			true,
 		); err != nil {
 			return fmt.Errorf("could not reconcile shoot webhooks: %w", err)
 		}

diff --git a/test/e2e/force_delete_test.go b/test/e2e/force_delete_test.go
@@ -30,7 +30,7 @@ var _ = Describe("Network Extension Tests", Label("Network"), func() {
 		By("Wait for Shoot to be force-deleted")
 		ctx, cancel = context.WithTimeout(parentCtx, 10*time.Minute)
 		defer cancel()
-		Expect(f.ForceDeleteShootAndWaitForDeletion(ctx, f.Shoot)).To(Succeed())
+		Expect(f.ForceDeleteShootAndWaitForDeletion(ctx, f.Shoot, f.ShootFramework.SeedClient.Client())).To(Succeed())
 
 		By("Network Test status")
 		Expect(succeeded).To(BeTrue())

diff --git a/test/e2e/network_connectivity_test.go b/test/e2e/network_connectivity_test.go
@@ -57,7 +57,7 @@ var _ = Describe("Network Extension Tests", Label("Network"), func() {
 
 		shootKubeconfigSecret := &corev1.Secret{}
 		gardenClient := f.GardenClient.Client()
-		gardenClient.Get(ctx, kubernetesutils.Key(f.Shoot.Namespace, gardenerutils.ComputeShootProjectSecretName(f.Shoot.Name, gardenerutils.ShootProjectSecretSuffixKubeconfig)), shootKubeconfigSecret)
+		gardenClient.Get(ctx, kubernetesutils.Key(f.Shoot.Namespace, gardenerutils.ComputeShootProjectResourceName(f.Shoot.Name, gardenerutils.ShootProjectSecretSuffixKubeconfig)), shootKubeconfigSecret)
 		Expect(err).NotTo(HaveOccurred())
 
 		f.ShootFramework.ShootClient, err = access.CreateShootClientFromAdminKubeconfig(ctx, f.GardenClient, f.Shoot)

diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
@@ -70,7 +70,7 @@ func testNetwork(ctx context.Context, f *framework.ShootCreationFramework) bool
 
 	shootKubeconfigSecret := &corev1.Secret{}
 	gardenClient := f.GardenClient.Client()
-	gardenClient.Get(ctx, kubernetesutils.Key(f.Shoot.Namespace, gardenerutils.ComputeShootProjectSecretName(f.Shoot.Name, gardenerutils.ShootProjectSecretSuffixKubeconfig)), shootKubeconfigSecret)
+	gardenClient.Get(ctx, kubernetesutils.Key(f.Shoot.Namespace, gardenerutils.ComputeShootProjectResourceName(f.Shoot.Name, gardenerutils.ShootProjectSecretSuffixKubeconfig)), shootKubeconfigSecret)
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
 	f.ShootFramework.ShootClient, err = access.CreateShootClientFromAdminKubeconfig(ctx, f.GardenClient, f.Shoot)