Revert the etcdbr bump & address review comments

gardener · Jul 17, 2024 · 585d628 · 585d628
1 parent b16e7f0
commit 585d628
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/docs/development/getting-started-locally-fakegcs.md b/docs/development/getting-started-locally-fakegcs.md
@@ -44,12 +44,12 @@ make deploy
 To configure `FakeGCS` to be used as backup store for etcd, Uncomment the `spec.backup.store` section of the etcd yaml in `config/samples/druid_v1alpha1_etcd.yaml` and replace it with the following:
 
 ```yaml
-store:
-  secretRef:
-    name: etcd-backup-gcp
-  container: etcd-bucket
-  provider: gcp # options: aws,azure,gcp,openstack,alicloud,dell,openshift,local
-  prefix: etcd-test
+    store:
+      secretRef:
+        name: etcd-backup-gcp
+      container: etcd-bucket
+      provider: gcp
+      prefix: etcd-test
 ```
 
 Now, apply the required Kubernetes manifests to create an etcd custom resource (CR) and a secret for GCP credentials, facilitating FakeGCS access:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/gardener/etcd-druid
 go 1.22
 
 require (
-	github.com/gardener/etcd-backup-restore v0.29.0
+	github.com/gardener/etcd-backup-restore v0.26.0
 	github.com/gardener/gardener v1.86.4
 	github.com/go-logr/logr v1.2.4
 	github.com/golang-jwt/jwt/v5 v5.2.1

diff --git a/go.sum b/go.sum
@@ -143,8 +143,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/gardener/etcd-backup-restore v0.29.0 h1:awzXySrK8GBMiMigdi9dEfqyulas2FEwnBWxzheULtA=
-github.com/gardener/etcd-backup-restore v0.29.0/go.mod h1:cAY12PXK6oJgh5X/V6AuQ8eCpJspPNlnbNSwwjToj18=
+github.com/gardener/etcd-backup-restore v0.26.0 h1:ux0U5OT6IwtFiGbx4d3q+KYGRg6dTxBULPm8DL73E98=
+github.com/gardener/etcd-backup-restore v0.26.0/go.mod h1:cAY12PXK6oJgh5X/V6AuQ8eCpJspPNlnbNSwwjToj18=
 github.com/gardener/gardener v1.86.4 h1:uxMalw67jddMXliPhv5vs1nOB7G8hbFE1XKoyZjIMlE=
 github.com/gardener/gardener v1.86.4/go.mod h1:8eHlXs2EkaghrgQwK8qEiVw3dZGpNJaq+I9IkPpReA4=
 github.com/gardener/hvpa-controller/api v0.5.0 h1:f4F3O7YUrenwh4S3TgPREPiB287JjjUiUL18OqPLyAA=

diff --git a/hack/ci-e2e-kind-gcs.sh b/hack/ci-e2e-kind-gcs.sh
@@ -9,9 +9,10 @@ set -o pipefail
 
 make kind-up
 
-trap "
-  ( make kind-down )
-" EXIT
+trap '{
+  kind export logs "${ARTIFACTS:-/tmp}/etcd-druid-e2e" --name etcd-druid-e2e || true
+  make kind-down
+}' EXIT
 
 kubectl wait --for=condition=ready node --all
 echo "{ \"serviceaccount.json\": \"\", \"storageAPIEndpoint\": \"http://fake-gcs.default:8000/storage/v1/\", \"emulatorEnabled\": \"true\" }" >/tmp/svc_acc.json

diff --git a/internal/common/constants.go b/internal/common/constants.go
@@ -69,8 +69,8 @@ const (
 	EnvGoogleApplicationCredentials = "GOOGLE_APPLICATION_CREDENTIALS"
 	// EnvGoogleStorageAPIEndpoint is the environment variable key for Google storage API endpoint override.
 	EnvGoogleStorageAPIEndpoint = "GOOGLE_STORAGE_API_ENDPOINT"
-	// EnvEmulatorEnabled is the environment variable key for Google storage emulator.
-	EnvEmulatorEnabled = "GOOGLE_EMULATOR_ENABLED"
+	// EnvGCSEmulatorEnabled is the environment variable key for Google storage emulator.
+	EnvGCSEmulatorEnabled = "GOOGLE_EMULATOR_ENABLED"
 	// EnvOpenstackApplicationCredentials is the environment variable key for OpenStack application credentials.
 	EnvOpenstackApplicationCredentials = "OPENSTACK_APPLICATION_CREDENTIALS"
 	// EnvAlicloudApplicationCredentials is the environment variable key for Alicloud application credentials.

diff --git a/internal/store/store.go b/internal/store/store.go
@@ -129,7 +129,7 @@ func GetProviderEnvVars(store *druidv1alpha1.StoreSpec) ([]corev1.EnvVar, error)
 	case GCS:
 		envVars = append(envVars, utils.GetEnvVarFromValue(common.EnvGoogleApplicationCredentials, fmt.Sprintf("%sserviceaccount.json", common.VolumeMountPathGCSBackupSecret)))
 		envVars = append(envVars, utils.GetEnvVarFromSecret(common.EnvGoogleStorageAPIEndpoint, store.SecretRef.Name, "storageAPIEndpoint", true))
-		envVars = append(envVars, utils.GetEnvVarFromSecret(common.EnvEmulatorEnabled, store.SecretRef.Name, "emulatorEnabled", true))
+		envVars = append(envVars, utils.GetEnvVarFromSecret(common.EnvGCSEmulatorEnabled, store.SecretRef.Name, "emulatorEnabled", true))
 
 	case Swift:
 		envVars = append(envVars, utils.GetEnvVarFromValue(common.EnvOpenstackApplicationCredentials, common.VolumeMountPathNonGCSProviderBackupSecret))

diff --git a/test/e2e/utils.go b/test/e2e/utils.go
@@ -387,7 +387,7 @@ func getProviders() ([]TestProvider, error) {
 						},
 					},
 				}
-				fakegcsenabled := getEnvOrFallback("GOOGLE_EMULATOR_ENABLED", "")
+				fakegcsenabled := getEnvOrFallback(common.EnvGCSEmulatorEnabled, "")
 				if enable, err := strconv.ParseBool(fakegcsenabled); err == nil && enable {
 					gcsEmulatorURL := getEnvOrFallback("GCS_EMULATOR_HOST", "")
 					provider.Storage.SecretData["storageAPIEndpoint"] = []byte("http://" + gcsEmulatorURL + "/storage/v1/")

diff --git a/test/integration/controllers/compaction/reconciler_test.go b/test/integration/controllers/compaction/reconciler_test.go
@@ -431,8 +431,8 @@ func validateStoreGCPForCompactionJob(instance *druidv1alpha1.Etcd, j *batchv1.J
 										})),
 									})),
 								}),
-								common.EnvEmulatorEnabled: MatchFields(IgnoreExtras, Fields{
-									"Name": Equal(common.EnvEmulatorEnabled),
+								common.EnvGCSEmulatorEnabled: MatchFields(IgnoreExtras, Fields{
+									"Name": Equal(common.EnvGCSEmulatorEnabled),
 									"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
 										"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
 											"LocalObjectReference": MatchFields(IgnoreExtras, Fields{