From b16e7f04364de81af89071031c87644469e7c5ec Mon Sep 17 00:00:00 2001 From: Anvesh Reddy Pinnapureddy Date: Tue, 16 Jul 2024 15:48:45 +0530 Subject: [PATCH] Address review comments by @seshachalam-yv --- config/samples/etcd-secret-fakegcs.yaml | 2 +- .../getting-started-locally-fakegcs.md | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/config/samples/etcd-secret-fakegcs.yaml b/config/samples/etcd-secret-fakegcs.yaml index e91df1a8d..e2e6135c5 100644 --- a/config/samples/etcd-secret-fakegcs.yaml +++ b/config/samples/etcd-secret-fakegcs.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: bucketName: ZXRjZC1idWNrZXQ= - serviceaccount.json: #ZHVtbXk= #dummy + serviceaccount.json: ZHVtbXk= #dummy storageAPIEndpoint: aHR0cDovL2Zha2UtZ2NzLmRlZmF1bHQ6ODAwMC9zdG9yYWdlL3YxLw== #http://fake-gcs.default:8000/storage/v1/ emulatorEnabled: dHJ1ZQ== #true kind: Secret diff --git a/docs/development/getting-started-locally-fakegcs.md b/docs/development/getting-started-locally-fakegcs.md index a37157382..8b7a13d15 100644 --- a/docs/development/getting-started-locally-fakegcs.md +++ b/docs/development/getting-started-locally-fakegcs.md @@ -33,14 +33,6 @@ gsutil -o "Credentials:gs_json_host=127.0.0.1" -o "Credentials:gs_json_port=4443 ### Step 4: Deploy etcd-druid -> **Note :** To avoid file storage permission issues when using `fakegcs`, use [etcd wrapper](https://github.com/gardener/etcd-wrapper). Refer the [ops-guide](https://github.tools.sap/kubernetes/ops-guide/blob/master/01_Operations/02_How_To_Guides/03_Other/ETCD_Operations.md#debugging-etcd-clusters-running-a-etcd-wrapper-images) to learn how to debug etcd-wrapper - -To use etcd-wrapper for druid local setup, export the following flag: - -```bash -export USE_ETCD_DRUID_FEATURE_GATES=true -``` - Deploy etcd-druid onto the Kind cluster using the command below: ```bash @@ -54,7 +46,7 @@ To configure `FakeGCS` to be used as backup store for etcd, Uncomment the `spec. ```yaml store: secretRef: - name: etcd-backup-gcp + name: etcd-backup-gcp container: etcd-bucket provider: gcp # options: aws,azure,gcp,openstack,alicloud,dell,openshift,local prefix: etcd-test @@ -66,16 +58,10 @@ Now, apply the required Kubernetes manifests to create an etcd custom resource ( ```bash export KUBECONFIG=hack/e2e-test/infrastructure/kind/kubeconfig -kubectl apply -f config/samples/druid_v1alpha1_etcd.yaml -f config/samples/etcd-secret-fakegcs.yaml +kubectl apply -f config/samples/etcd-secret-fakegcs.yaml -f config/samples/druid_v1alpha1_etcd.yaml ``` -### Step 6: Reconcile the etcd - -Initiate etcd reconciliation by annotating the etcd resource with the `gardener.cloud/operation=reconcile` annotation: -```bash -kubectl annotate etcd etcd-test gardener.cloud/operation=reconcile -``` To validate the buckets, execute the following command: