From 8544811c8f24b4adbbb37e6788255bdc7358ddb7 Mon Sep 17 00:00:00 2001
From: sonicaj <waqarsonic1@gmail.com>
Date: Tue, 28 Nov 2023 15:00:53 +0000
Subject: [PATCH] Publish new changes in catalog

---
 charts/storj/{1.0.16 => 1.0.17}/Chart.lock          |   0
 charts/storj/{1.0.16 => 1.0.17}/Chart.yaml          |   2 +-
 charts/storj/{1.0.16 => 1.0.17}/README.md           |   0
 charts/storj/{1.0.16 => 1.0.17}/app-readme.md       |   0
 .../{1.0.16 => 1.0.17}/charts/common-2304.0.1.tgz   | Bin
 charts/storj/{1.0.16 => 1.0.17}/ci/test-values.yaml |   1 +
 charts/storj/{1.0.16 => 1.0.17}/ix_values.yaml      |   0
 charts/storj/{1.0.16 => 1.0.17}/metadata.yaml       |   0
 charts/storj/{1.0.16 => 1.0.17}/questions.yaml      |  10 +++++++++-
 .../storj/{1.0.16 => 1.0.17}/templates/_helpers.tpl |   0
 .../{1.0.16 => 1.0.17}/templates/deployment.yaml    |  11 +++++++++--
 .../templates/initial_scripts.yaml                  |   0
 .../templates/pre-install-job.yaml                  |   0
 .../storj/{1.0.16 => 1.0.17}/templates/service.yaml |   0
 .../{1.0.16 => 1.0.17}/templates/storj-secrets.yaml |   0
 .../{1.0.16 => 1.0.17}/upgrade_strategy_disable     |   0
 16 files changed, 20 insertions(+), 4 deletions(-)
 rename charts/storj/{1.0.16 => 1.0.17}/Chart.lock (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/Chart.yaml (97%)
 rename charts/storj/{1.0.16 => 1.0.17}/README.md (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/app-readme.md (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/charts/common-2304.0.1.tgz (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/ci/test-values.yaml (97%)
 rename charts/storj/{1.0.16 => 1.0.17}/ix_values.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/metadata.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/questions.yaml (96%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/_helpers.tpl (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/deployment.yaml (92%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/initial_scripts.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/pre-install-job.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/service.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/templates/storj-secrets.yaml (100%)
 rename charts/storj/{1.0.16 => 1.0.17}/upgrade_strategy_disable (100%)

diff --git a/charts/storj/1.0.16/Chart.lock b/charts/storj/1.0.17/Chart.lock
similarity index 100%
rename from charts/storj/1.0.16/Chart.lock
rename to charts/storj/1.0.17/Chart.lock
diff --git a/charts/storj/1.0.16/Chart.yaml b/charts/storj/1.0.17/Chart.yaml
similarity index 97%
rename from charts/storj/1.0.16/Chart.yaml
rename to charts/storj/1.0.17/Chart.yaml
index 85f31e6b5e..bb0542f965 100644
--- a/charts/storj/1.0.16/Chart.yaml
+++ b/charts/storj/1.0.17/Chart.yaml
@@ -3,7 +3,7 @@ description: Share your storage on the internet and earn.
 annotations:
   title: Storj
 type: application
-version: 1.0.16
+version: 1.0.17
 apiVersion: v2
 appVersion: v1.68.2
 kubeVersion: '>=1.16.0-0'
diff --git a/charts/storj/1.0.16/README.md b/charts/storj/1.0.17/README.md
similarity index 100%
rename from charts/storj/1.0.16/README.md
rename to charts/storj/1.0.17/README.md
diff --git a/charts/storj/1.0.16/app-readme.md b/charts/storj/1.0.17/app-readme.md
similarity index 100%
rename from charts/storj/1.0.16/app-readme.md
rename to charts/storj/1.0.17/app-readme.md
diff --git a/charts/storj/1.0.16/charts/common-2304.0.1.tgz b/charts/storj/1.0.17/charts/common-2304.0.1.tgz
similarity index 100%
rename from charts/storj/1.0.16/charts/common-2304.0.1.tgz
rename to charts/storj/1.0.17/charts/common-2304.0.1.tgz
diff --git a/charts/storj/1.0.16/ci/test-values.yaml b/charts/storj/1.0.17/ci/test-values.yaml
similarity index 97%
rename from charts/storj/1.0.16/ci/test-values.yaml
rename to charts/storj/1.0.17/ci/test-values.yaml
index d9b84ede2d..5f75e84923 100644
--- a/charts/storj/1.0.16/ci/test-values.yaml
+++ b/charts/storj/1.0.17/ci/test-values.yaml
@@ -22,3 +22,4 @@ storageSize: 500
 wallet: 0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 webPort: 30000
 zksync: true
+zksyncEra: true
diff --git a/charts/storj/1.0.16/ix_values.yaml b/charts/storj/1.0.17/ix_values.yaml
similarity index 100%
rename from charts/storj/1.0.16/ix_values.yaml
rename to charts/storj/1.0.17/ix_values.yaml
diff --git a/charts/storj/1.0.16/metadata.yaml b/charts/storj/1.0.17/metadata.yaml
similarity index 100%
rename from charts/storj/1.0.16/metadata.yaml
rename to charts/storj/1.0.17/metadata.yaml
diff --git a/charts/storj/1.0.16/questions.yaml b/charts/storj/1.0.17/questions.yaml
similarity index 96%
rename from charts/storj/1.0.16/questions.yaml
rename to charts/storj/1.0.17/questions.yaml
index d9855e2701..99225f0665 100644
--- a/charts/storj/1.0.16/questions.yaml
+++ b/charts/storj/1.0.17/questions.yaml
@@ -101,7 +101,15 @@ questions:
 
   - variable: zksync
     label: "Opt-in to zkSync"
-    description: Appends --operator.wallet-features=zksync flag to the storagenode command
+    description: Appends "zksync" to --operator.wallet-features flag to the storagenode command
+    group: "Configuration"
+    schema:
+      type: boolean
+      default: false
+
+  - variable: zksyncEra
+    label: "Opt-in to zkSync era"
+    description: Appends "zksync-era" to --operator.wallet-features flag to the storagenode command
     group: "Configuration"
     schema:
       type: boolean
diff --git a/charts/storj/1.0.16/templates/_helpers.tpl b/charts/storj/1.0.17/templates/_helpers.tpl
similarity index 100%
rename from charts/storj/1.0.16/templates/_helpers.tpl
rename to charts/storj/1.0.17/templates/_helpers.tpl
diff --git a/charts/storj/1.0.16/templates/deployment.yaml b/charts/storj/1.0.17/templates/deployment.yaml
similarity index 92%
rename from charts/storj/1.0.16/templates/deployment.yaml
rename to charts/storj/1.0.17/templates/deployment.yaml
index 6610b9d39a..14da806f41 100644
--- a/charts/storj/1.0.16/templates/deployment.yaml
+++ b/charts/storj/1.0.17/templates/deployment.yaml
@@ -78,9 +78,16 @@ spec:
             - name: udp
               containerPort: 28967
               protocol: UDP
-          {{ if .Values.zksync }}
+          {{- $walletFeats := list -}}
+          {{- if .Values.zksync }}
+            {{- $walletFeats = mustAppend $walletFeats "zksync" -}}
+          {{- end -}}
+          {{ if .Values.zksyncEra }}
+            {{- $walletFeats = mustAppend $walletFeats "zksync-era" -}}
+          {{- end -}}
+          {{- if $walletFeats }}
           args:
-            - --operator.wallet-features=zksync
+            - --operator.wallet-features={{ join "," $walletFeats }}
           {{ end }}
           env:
             {{ $envList := (default list .Values.environmentVariables) }}
diff --git a/charts/storj/1.0.16/templates/initial_scripts.yaml b/charts/storj/1.0.17/templates/initial_scripts.yaml
similarity index 100%
rename from charts/storj/1.0.16/templates/initial_scripts.yaml
rename to charts/storj/1.0.17/templates/initial_scripts.yaml
diff --git a/charts/storj/1.0.16/templates/pre-install-job.yaml b/charts/storj/1.0.17/templates/pre-install-job.yaml
similarity index 100%
rename from charts/storj/1.0.16/templates/pre-install-job.yaml
rename to charts/storj/1.0.17/templates/pre-install-job.yaml
diff --git a/charts/storj/1.0.16/templates/service.yaml b/charts/storj/1.0.17/templates/service.yaml
similarity index 100%
rename from charts/storj/1.0.16/templates/service.yaml
rename to charts/storj/1.0.17/templates/service.yaml
diff --git a/charts/storj/1.0.16/templates/storj-secrets.yaml b/charts/storj/1.0.17/templates/storj-secrets.yaml
similarity index 100%
rename from charts/storj/1.0.16/templates/storj-secrets.yaml
rename to charts/storj/1.0.17/templates/storj-secrets.yaml
diff --git a/charts/storj/1.0.16/upgrade_strategy_disable b/charts/storj/1.0.17/upgrade_strategy_disable
similarity index 100%
rename from charts/storj/1.0.16/upgrade_strategy_disable
rename to charts/storj/1.0.17/upgrade_strategy_disable