Place config in zenko.yml instead of patch it in configuration to avo…

…id reconcile Issue: ZENKO-4805
scality · May 31, 2024 · 4e479c4 · 4e479c4
1 parent 856170c
commit 4e479c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.github/scripts/end2end/configs/zenko.yaml b/.github/scripts/end2end/configs/zenko.yaml
@@ -101,14 +101,19 @@ spec:
       e2e-cold:
         debug: "true"
         command-timeout: "60s"
+        pending-job-poll-after-age: "10s"
+        pending-job-poll-check-interval: "10s"
+      e2e-azure-archive:
+        pending-job-poll-after-age: "10s"
+        pending-job-poll-check-interval: "10s"
     server:
       tar:
         targetSize: 10KB
         maxObjects: 3
         maxDelay: "5s"
       azure:
         archiveTier: "hot"
-        pollingDelay: "1s"
+        restoreTimeout: "15s"
   ingress:
     workloadPlaneClass: 'nginx'
     controlPlaneClass: 'nginx'

diff --git a/.github/scripts/end2end/configure-e2e-ctst.sh b/.github/scripts/end2end/configure-e2e-ctst.sh
@@ -21,15 +21,6 @@ kubectl wait --for condition=DeploymentInProgress=true --timeout 10m zenko/${ZEN
 kubectl wait --for condition=DeploymentFailure=false --timeout 10m zenko/${ZENKO_NAME}
 kubectl wait --for condition=DeploymentInProgress=false --timeout 10m zenko/${ZENKO_NAME}
 
-# Patch sorbet env
-kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-azure-archive":{"pending-job-poll-after-age":"10s"}}}}}'
-kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-azure-archive":{"pending-job-poll-check-interval":"10s"}}}}}'
-
-kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-cold":{"pending-job-poll-after-age":"10s"}}}}}'
-kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-cold":{"pending-job-poll-check-interval":"10s"}}}}}'
-
-kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"server":{"azure":{"restoreTimeout":"15s"}}}}}'
-
 # Get kafka image name and tag
 KAFKA_REGISTRY_NAME=$(yq eval ".kafka.sourceRegistry" ../../../solution/deps.yaml)
 KAFKA_IMAGE_NAME=$(yq eval ".kafka.image" ../../../solution/deps.yaml)