upgraded go version to 1.22.1

.ci/pipeline_definitions

@@ -35,13 +35,13 @@ etcd-druid:
                 teamname: 'gardener/etcd-druid-maintainers'
     steps:
       check:
-        image: 'golang:1.21.4'
+        image: 'golang:1.22.1'
       test:
-        image: 'golang:1.21.4'
+        image: 'golang:1.22.1'
       test_integration:
-        image: 'golang:1.21.4'
+        image: 'golang:1.22.1'
       build:
-        image: 'golang:1.21.4'
+        image: 'golang:1.22.1'
         output_dir: 'binary'
 
   jobs:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.4 as builder
+FROM golang:1.22.1 as builder
 WORKDIR /go/src/github.com/gardener/etcd-druid
 COPY . .
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/gardener/etcd-druid
 
-go 1.21
+go 1.22.1
 
 require (
 	github.com/gardener/etcd-backup-restore v0.26.0

test/e2e/etcd_multi_node_test.go

@@ -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 {

test/e2e/utils.go

@@ -877,7 +877,7 @@ func etcdZeroDownTimeValidatorJob(etcdSvc, testName string, tls *v1alpha1.TLSCon
 							"$(curl --cacert /var/etcd/ssl/client/ca/ca.crt --cert /var/etcd/ssl/client/client/tls.crt --key /var/etcd/ssl/client/client/tls.key https://" + etcdSvc + ":2379/health -s -f  -o /dev/null ); " +
 							"if [ $? -gt 0 ] ; then let failed++; echo \"etcd is unhealthy and retrying\"; sleep 1; continue;  fi ; " +
 							"echo \"etcd is healthy\";  touch /tmp/healthy; let failed=0; " +
-							"sleep 1; done;  echo \"etcd is unhealthy\"; exit 1;" +
+							"sleep 2; done;  echo \"etcd is unhealthy\"; exit 1;" +
 							"' > test.sh && sh test.sh",
 					},
 					ReadinessProbe: &corev1.Probe{