Vendored ETCD Backup Restore version 0.22.0

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/Masterminds/semver v1.5.0
-	github.com/gardener/etcd-backup-restore v0.14.1
+	github.com/gardener/etcd-backup-restore v0.22.0
 	github.com/gardener/gardener v1.65.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.2.3

hack/ci-e2e-kind.sh

@@ -20,23 +20,24 @@ set -x
 
 make kind-up
 
-trap "
-  ( make kind-down )
-" EXIT
+# trap "
+#   ( make kind-down )
+# " EXIT
 
-kubectl wait --for=condition=ready node kind-control-plane
+kubectl wait --for=condition=ready node --all
+export AWS_APPLICATION_CREDENTIALS_JSON="/tmp/aws.json"
+echo "{ \"accessKeyID\": \"ACCESSKEYAWSUSER\", \"secretAccessKey\": \"sEcreTKey\", \"region\": \"us-east-2\", \"endpoint\": \"http://localstack.default:4566\", \"s3ForcePathStyle\": true, \"bucketName\": \"${BUCKET_NAME}\" }" > /tmp/aws.json
 
 make deploy-localstack BUCKET_NAME="$BUCKET_NAME"
 make LOCALSTACK_HOST="localstack.default:4566" \
   AWS_ACCESS_KEY_ID="ACCESSKEYAWSUSER" \
   AWS_SECRET_ACCESS_KEY="sEcreTKey" \
   AWS_REGION="us-east-2" \
   PROVIDERS="aws" \
-  KUBECONFIG="$HOME/.kube/config" \
   TEST_ID="$BUCKET_NAME" \
   STEPS="setup,deploy,test" \
 test-e2e
 
-make kind-down
+# make kind-down
 
 

hack/deploy-localstack.sh

@@ -54,6 +54,12 @@ EOF
 
 kubectl delete pods -n kube-system -l k8s-app=kube-dns
 kubectl delete pods -n kube-system -l k8s-app=kube-dns
-kubectl wait --for=condition=ready pod -n kube-system -l k8s-app=kube-dns
-kubectl wait --for=condition=ready pod -l app=localstack
+kubectl wait --for=condition=ready pod -n kube-system -l k8s-app=kube-dns --timeout=120s
+kubectl wait --for=condition=ready pod -l app=localstack --timeout=240s
 
+if ! grep -q -x "127.0.0.1 localstack.default" /etc/hosts; then
+   # Hostname for Localstack 'localstack.default' is missing in /etc/hosts.
+   # To access localstack and run e2e tests, you have to extend your /etc/hosts file.
+   echo "Adding Locastack host 'localstack.default' in /etc/hosts"
+   printf "\n127.0.0.1 localstack.default\n" >>/etc/hosts
+fi