changed license header for scripts, fixed flaky e2e tests, removed de…

…precated method usage
gardener · Apr 16, 2024 · 92dddad · 92dddad
1 parent 856a2d9
commit 92dddad
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 44 deletions.
diff --git a/.ci/set_dependency_version b/.ci/set_dependency_version
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
+#
+# SPDX-License-Identifier: Apache-2.0
 
 "$(dirname "$0")"/hack/set_dependency_version
diff --git a/hack/addlicenseheaders.sh b/hack/addlicenseheaders.sh
@@ -18,7 +18,6 @@ sed 's|^// *||' hack/boilerplate.go.txt > $temp_file
 
 addlicense \
   -f $temp_file \
-  -ignore "vendor/**" \
   -ignore "**/*.md" \
   -ignore "**/*.yaml" \
   -ignore "**/Dockerfile" \

diff --git a/hack/ci-e2e-kind.sh b/hack/ci-e2e-kind.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-#
 # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+
 set -o errexit
 set -o nounset
 set -o pipefail

diff --git a/hack/deploy-localstack.sh b/hack/deploy-localstack.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-#
 # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0
+
 set -o errexit
 set -o nounset
 set -o pipefail

diff --git a/hack/get-version.sh b/hack/get-version.sh
@@ -4,7 +4,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-
 # The test-machinery testrunner injects two environment variables into test runs to specify which version should be
 # tested (TM_GIT_SHA and TM_GIT_REF, see https://github.com/gardener/test-infra/blob/master/docs/testmachinery/GetStarted.md#input-contract)
 # Use those to calculate the terraformer version in order to tell the e2e test (via ldflags), which terraformer image

diff --git a/hack/kind-up.sh b/hack/kind-up.sh
@@ -3,7 +3,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-
 set -o errexit
 set -o nounset
 set -o pipefail

diff --git a/hack/print-content.sh b/hack/print-content.sh
@@ -3,5 +3,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-
 cat docs/proposals/multi-node/README.md | gh-md-toc - | sed 's/\*/-/g' | sed 's/   /  /g' | sed 's/^  //'
diff --git a/hack/test.sh b/hack/test.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-#
 # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-#
 # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
 #
 # SPDX-License-Identifier: Apache-2.0

diff --git a/test/e2e/etcd_backup_test.go b/test/e2e/etcd_backup_test.go
@@ -80,7 +80,7 @@ var _ = Describe("Etcd Backup", func() {
 
 					By("Check initial snapshot is available")
 
-					latestSnapshotsBeforePopulate, err := getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsBeforePopulate, err := getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 					// We don't expect any delta snapshot as the cluster
 					Expect(latestSnapshotsBeforePopulate.DeltaSnapshots).To(HaveLen(0))
@@ -94,15 +94,15 @@ var _ = Describe("Etcd Backup", func() {
 						"toKey", fmt.Sprintf("%s-10", etcdKeyPrefix), "toValue", fmt.Sprintf("%s-10", etcdValuePrefix))
 
 					// populate 10 keys in etcd, finishing in 10 seconds
-					err = populateEtcd(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 1, 10, time.Second*1)
+					err = populateEtcd(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 1, 10, time.Second*1)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Check snapshot after putting data into etcd")
-					latestSnapshotsAfterPopulate, err := getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsAfterPopulate, err := getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					Eventually(func() int {
-						latestSnapshotsAfterPopulate, err = getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+						latestSnapshotsAfterPopulate, err = getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 						Expect(err).NotTo(HaveOccurred())
 						return len(latestSnapshotsAfterPopulate.DeltaSnapshots)
 					}, singleNodeEtcdTimeout, pollingInterval).Should(BeNumerically(">", len(latestSnapshotsBeforePopulate.DeltaSnapshots)))
@@ -116,7 +116,7 @@ var _ = Describe("Etcd Backup", func() {
 					Expect(latestSnapshotAfterPopulate.CreatedOn.After(latestSnapshotBeforePopulate.CreatedOn)).To(BeTrue())
 
 					By("Trigger on-demand full snapshot")
-					fullSnapshot, err := triggerOnDemandSnapshot(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindFull)
+					fullSnapshot, err := triggerOnDemandSnapshot(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindFull)
 					Expect(err).ShouldNot(HaveOccurred())
 					Expect(fullSnapshot.LastRevision).To(Equal(10 + latestSnapshotBeforePopulate.LastRevision))
 
@@ -125,15 +125,15 @@ var _ = Describe("Etcd Backup", func() {
 						"fromKey", fmt.Sprintf("%s-11", etcdKeyPrefix), "fromValue", fmt.Sprintf("%s-11", etcdValuePrefix),
 						"toKey", fmt.Sprintf("%s-15", etcdKeyPrefix), "toValue", fmt.Sprintf("%s-15", etcdValuePrefix))
 					// populate 5 keys in etcd, finishing in 5 seconds
-					err = populateEtcd(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 11, 15, time.Second*1)
+					err = populateEtcd(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 11, 15, time.Second*1)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Trigger on-demand delta snapshot")
-					_, err = triggerOnDemandSnapshot(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
+					_, err = triggerOnDemandSnapshot(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Test cluster restoration by deleting data directory")
-					Expect(deleteDir(kubeconfigPath, namespace, debugPod.Name, debugPod.Spec.Containers[0].Name, "/var/etcd/data/new.etcd/member")).To(Succeed())
+					Expect(deleteDir(ctx, kubeconfigPath, namespace, debugPod.Name, debugPod.Spec.Containers[0].Name, "/var/etcd/data/new.etcd/member")).To(Succeed())
 
 					logger.Info("waiting for sts to become unready", "statefulSetName", etcdName)
 					Eventually(func() error {
@@ -169,7 +169,7 @@ var _ = Describe("Etcd Backup", func() {
 
 					// verify existence and correctness of keys 1 to 30
 					logger.Info("fetching etcd key-value pairs")
-					keyValueMap, err := getEtcdKeys(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, 1, 15)
+					keyValueMap, err := getEtcdKeys(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, 1, 15)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					for i := 1; i <= 15; i++ {

diff --git a/test/e2e/etcd_compaction_test.go b/test/e2e/etcd_compaction_test.go
@@ -73,7 +73,7 @@ var _ = Describe("Etcd Compaction", func() {
 
 					By("Check initial snapshot is available")
 
-					latestSnapshotsBeforePopulate, err := getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsBeforePopulate, err := getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 					// We don't expect any delta snapshot as the cluster
 					Expect(latestSnapshotsBeforePopulate.DeltaSnapshots).To(HaveLen(0))
@@ -87,16 +87,16 @@ var _ = Describe("Etcd Compaction", func() {
 						"toKey", fmt.Sprintf("%s-10", etcdKeyPrefix), "toValue", fmt.Sprintf("%s-10", etcdValuePrefix))
 
 					// populate 10 keys in etcd, finishing in 10 seconds
-					err = populateEtcd(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 1, 10, time.Second*1)
+					err = populateEtcd(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 1, 10, time.Second*1)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Check snapshot after putting data into etcd")
 
-					latestSnapshotsAfterPopulate, err := getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsAfterPopulate, err := getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					Eventually(func() int {
-						latestSnapshotsAfterPopulate, err = getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+						latestSnapshotsAfterPopulate, err = getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 						Expect(err).NotTo(HaveOccurred())
 						return len(latestSnapshotsAfterPopulate.DeltaSnapshots)
 					}, singleNodeEtcdTimeout, pollingInterval).Should(BeNumerically(">", len(latestSnapshotsBeforePopulate.DeltaSnapshots)))
@@ -114,11 +114,11 @@ var _ = Describe("Etcd Compaction", func() {
 						"fromKey", fmt.Sprintf("%s-11", etcdKeyPrefix), "fromValue", fmt.Sprintf("%s-11", etcdValuePrefix),
 						"toKey", fmt.Sprintf("%s-15", etcdKeyPrefix), "toValue", fmt.Sprintf("%s-15", etcdValuePrefix))
 					// populate 5 keys in etcd, finishing in 5 seconds
-					err = populateEtcd(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 11, 15, time.Second*1)
+					err = populateEtcd(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 11, 15, time.Second*1)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Trigger on-demand delta snapshot")
-					_, err = triggerOnDemandSnapshot(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
+					_, err = triggerOnDemandSnapshot(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					logger.Info("waiting for compaction job to become successful")
@@ -145,7 +145,7 @@ var _ = Describe("Etcd Compaction", func() {
 					logger.Info("compaction job is successful")
 
 					By("Verify that all the delta snapshots are compacted to full snapshots by compaction triggerred at first 15th revision")
-					latestSnapshotsAfterPopulate, err = getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsAfterPopulate, err = getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					Expect(len(latestSnapshotsAfterPopulate.DeltaSnapshots)).Should(BeNumerically("==", 0))
@@ -155,15 +155,15 @@ var _ = Describe("Etcd Compaction", func() {
 						"fromKey", fmt.Sprintf("%s-16", etcdKeyPrefix), "fromValue", fmt.Sprintf("%s-16", etcdValuePrefix),
 						"toKey", fmt.Sprintf("%s-20", etcdKeyPrefix), "toValue", fmt.Sprintf("%s-20", etcdValuePrefix))
 					// populate 5 keys in etcd, finishing in 5 seconds
-					err = populateEtcd(logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 16, 20, time.Second*1)
+					err = populateEtcd(ctx, logger, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, etcdKeyPrefix, etcdValuePrefix, 16, 20, time.Second*1)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Trigger on-demand delta snapshot")
-					_, err = triggerOnDemandSnapshot(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
+					_, err = triggerOnDemandSnapshot(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080, brtypes.SnapshotKindDelta)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					By("Verify that there are new delta snapshots as compaction is not triggered yet because delta events have not reached next 15 revision")
-					latestSnapshotsAfterPopulate, err = getLatestSnapshots(kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
+					latestSnapshotsAfterPopulate, err = getLatestSnapshots(ctx, kubeconfigPath, namespace, etcdName, debugPod.Name, debugPod.Spec.Containers[0].Name, 8080)
 					Expect(err).ShouldNot(HaveOccurred())
 
 					Expect(len(latestSnapshotsAfterPopulate.DeltaSnapshots)).Should(BeNumerically(">", 0))

diff --git a/test/e2e/etcd_multi_node_test.go b/test/e2e/etcd_multi_node_test.go
@@ -240,7 +240,7 @@ var _ = Describe("Etcd", func() {
 })
 
 func deleteMemberDir(ctx context.Context, cl client.Client, logger logr.Logger, etcd *v1alpha1.Etcd, podName, containerName string) {
-	ExpectWithOffset(1, deleteDir(kubeconfigPath, namespace, podName, containerName, "/var/etcd/data/new.etcd/member")).To(Succeed())
+	ExpectWithOffset(1, deleteDir(ctx, kubeconfigPath, namespace, podName, containerName, "/var/etcd/data/new.etcd/member")).To(Succeed())
 	checkUnreadySts(ctx, cl, logger, etcd)
 }
 
@@ -312,7 +312,19 @@ func hibernateAndCheckEtcd(ctx context.Context, cl client.Client, logger logr.Lo
 		etcd.Spec.Replicas = 0
 		return cl.Update(ctx, etcd)
 	})).ToNot(HaveOccurred())
-	logger.Info("Waiting to hibernate")
+
+	logger.Info("Waiting for statefulset spec to reflect change in replicas to 0")
+	EventuallyWithOffset(1, func() error {
+		sts := &appsv1.StatefulSet{}
+		ExpectWithOffset(2, cl.Get(ctx, client.ObjectKeyFromObject(etcd), sts)).To(Succeed())
+		if sts.Spec.Replicas == nil {
+			return fmt.Errorf("etcd %q replicas is empty", etcd.Name)
+		}
+		if *sts.Spec.Replicas != 0 {
+			return fmt.Errorf("etcd %q replicas is %d, but expected to be 0", etcd.Name, *sts.Spec.Replicas)
+		}
+		return nil
+	}, timeout, pollingInterval).Should(BeNil())
 
 	logger.Info("Checking etcd")
 	EventuallyWithOffset(1, func() error {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,4 @@
		#
		# SPDX-License-Identifier: Apache-2.0


		cat docs/proposals/multi-node/README.md \| gh-md-toc - \| sed 's/\*/-/g' \| sed 's/ / /g' \| sed 's/^ //'