diff --git a/.github/ct-install-config/charts-ct-install.yaml b/.github/ct-install-config/charts-ct-install.yaml index cbe77b7b25..eca6819b41 100644 --- a/.github/ct-install-config/charts-ct-install.yaml +++ b/.github/ct-install-config/charts-ct-install.yaml @@ -12,5 +12,7 @@ chart-dirs: - library/ix-dev/community - library/ix-dev/enterprise excluded-charts: - - library/common-test - - library/common + - common-test + - common + # GH Runner does not have the required storage space + - storj diff --git a/.github/ct-install-config/charts-ct-lint.yaml b/.github/ct-install-config/charts-ct-lint.yaml index 4b950fb000..5e5e51618d 100644 --- a/.github/ct-install-config/charts-ct-lint.yaml +++ b/.github/ct-install-config/charts-ct-lint.yaml @@ -11,5 +11,5 @@ chart-dirs: - library/ix-dev/community - library/ix-dev/enterprise excluded-charts: - - library/common-test - - library/common + - common-test + - common diff --git a/charts/storj/1.0.5/Chart.lock b/charts/storj/1.0.5/Chart.lock deleted file mode 100644 index 31e49e590e..0000000000 --- a/charts/storj/1.0.5/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-08-02T17:37:09.365219548+05:00" diff --git a/charts/storj/1.0.5/Chart.yaml b/charts/storj/1.0.5/Chart.yaml deleted file mode 100644 index 9e8ba63e1d..0000000000 --- a/charts/storj/1.0.5/Chart.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v2 -appVersion: v1.68.2 -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: Share your storage on the internet and earn. -home: https://www.storj.io/ -icon: https://assets-global.website-files.com/602eda09fc78afc76e9706b6/60917835a05862243e7de9af_logo.svg -keywords: -- storage -- dapps -- networking -- financial -name: storj -version: 1.0.5 diff --git a/charts/storj/1.0.5/charts/common-2207.0.0.tgz b/charts/storj/1.0.5/charts/common-2207.0.0.tgz deleted file mode 100644 index b0fc2dcb6b..0000000000 Binary files a/charts/storj/1.0.5/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/library/ix-dev/charts/storj/Chart.lock b/library/ix-dev/charts/storj/Chart.lock new file mode 100644 index 0000000000..4d8c90625b --- /dev/null +++ b/library/ix-dev/charts/storj/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-22T19:36:11.899870629+02:00" diff --git a/library/ix-dev/charts/storj/Chart.yaml b/library/ix-dev/charts/storj/Chart.yaml new file mode 100644 index 0000000000..abe50d3384 --- /dev/null +++ b/library/ix-dev/charts/storj/Chart.yaml @@ -0,0 +1,26 @@ +name: storj +description: Share your storage on the internet and earn. +annotations: + title: Storj +type: application +version: 1.0.6 +apiVersion: v2 +appVersion: v1.68.2 +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://www.storj.io +icon: https://assets-global.website-files.com/602eda09fc78afc76e9706b6/60917835a05862243e7de9af_logo.svg +sources: + - https://www.storj.io + - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/storj +keywords: + - storage + - dapps + - networking + - financial diff --git a/charts/storj/1.0.5/README.md b/library/ix-dev/charts/storj/README.md similarity index 100% rename from charts/storj/1.0.5/README.md rename to library/ix-dev/charts/storj/README.md diff --git a/charts/storj/1.0.5/app-readme.md b/library/ix-dev/charts/storj/app-readme.md similarity index 100% rename from charts/storj/1.0.5/app-readme.md rename to library/ix-dev/charts/storj/app-readme.md diff --git a/library/ix-dev/charts/storj/charts/common-2207.0.0.tgz b/library/ix-dev/charts/storj/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..702b920ac5 Binary files /dev/null and b/library/ix-dev/charts/storj/charts/common-2207.0.0.tgz differ diff --git a/charts/storj/1.0.5/test_values.yaml b/library/ix-dev/charts/storj/ci/test-values.yaml similarity index 83% rename from charts/storj/1.0.5/test_values.yaml rename to library/ix-dev/charts/storj/ci/test-values.yaml index e3d43a9351..d9b84ede2d 100644 --- a/charts/storj/1.0.5/test_values.yaml +++ b/library/ix-dev/charts/storj/ci/test-values.yaml @@ -13,14 +13,12 @@ email: user@example.com emptyDirVolumes: true environmentVariables: [] extraAppVolumeMounts: [] +terminationGracePeriod: 120 identityCreationMountPath: /root/.local/share/storj/identity/storagenode -image: - pullPolicy: IfNotPresent - repository: storjlabs/storagenode - tag: 1d42f9ac3-v1.68.2-go1.18.8 nodePort: 30002 runAsGroup: 568 runAsUser: 568 storageSize: 500 wallet: 0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX webPort: 30000 +zksync: true diff --git a/charts/storj/item.yaml b/library/ix-dev/charts/storj/item.yaml similarity index 100% rename from charts/storj/item.yaml rename to library/ix-dev/charts/storj/item.yaml diff --git a/charts/storj/1.0.5/questions.yaml b/library/ix-dev/charts/storj/questions.yaml similarity index 94% rename from charts/storj/1.0.5/questions.yaml rename to library/ix-dev/charts/storj/questions.yaml index ce95893778..42d46a909b 100644 --- a/charts/storj/1.0.5/questions.yaml +++ b/library/ix-dev/charts/storj/questions.yaml @@ -95,6 +95,23 @@ questions: type: string required: true + - variable: zksync + label: "Opt-in to zkSync" + description: Appends --operator.wallet-features=zksync flag to the storagenode command + group: "Configuration" + schema: + type: boolean + default: false + + - variable: terminationGracePeriod + label: Termination Grace Period + description: Optional duration in seconds the pod needs to terminate gracefully. + group: "Configuration" + schema: + type: int + min: 30 + default: 30 + - variable: storageSize label: "Configure Storage Size You Want To Share in GB's" group: Storage diff --git a/charts/storj/1.0.5/templates/_helpers.tpl b/library/ix-dev/charts/storj/templates/_helpers.tpl similarity index 100% rename from charts/storj/1.0.5/templates/_helpers.tpl rename to library/ix-dev/charts/storj/templates/_helpers.tpl diff --git a/charts/storj/1.0.5/templates/deployment.yaml b/library/ix-dev/charts/storj/templates/deployment.yaml similarity index 95% rename from charts/storj/1.0.5/templates/deployment.yaml rename to library/ix-dev/charts/storj/templates/deployment.yaml index 51c782b4f2..6610b9d39a 100644 --- a/charts/storj/1.0.5/templates/deployment.yaml +++ b/library/ix-dev/charts/storj/templates/deployment.yaml @@ -27,6 +27,7 @@ spec: {{- include "common.labels.selectorLabels" . | nindent 8 }} annotations: {{ include "common.annotations" . | nindent 8 }} spec: + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod | default 30 }} initContainers: - name: generate-identity image: "alpine/curl:latest" @@ -77,6 +78,10 @@ spec: - name: udp containerPort: 28967 protocol: UDP + {{ if .Values.zksync }} + args: + - --operator.wallet-features=zksync + {{ end }} env: {{ $envList := (default list .Values.environmentVariables) }} {{ $envList = mustAppend $envList (dict "name" "WALLET" "valueFromSecret" true "secretName" "storj-credentials" "secretKey" "wallet") }} diff --git a/charts/storj/1.0.5/templates/initial_scripts.yaml b/library/ix-dev/charts/storj/templates/initial_scripts.yaml similarity index 100% rename from charts/storj/1.0.5/templates/initial_scripts.yaml rename to library/ix-dev/charts/storj/templates/initial_scripts.yaml diff --git a/charts/storj/1.0.5/templates/pre-install-job.yaml b/library/ix-dev/charts/storj/templates/pre-install-job.yaml similarity index 100% rename from charts/storj/1.0.5/templates/pre-install-job.yaml rename to library/ix-dev/charts/storj/templates/pre-install-job.yaml diff --git a/charts/storj/1.0.5/templates/service.yaml b/library/ix-dev/charts/storj/templates/service.yaml similarity index 100% rename from charts/storj/1.0.5/templates/service.yaml rename to library/ix-dev/charts/storj/templates/service.yaml diff --git a/charts/storj/1.0.5/templates/storj-secrets.yaml b/library/ix-dev/charts/storj/templates/storj-secrets.yaml similarity index 100% rename from charts/storj/1.0.5/templates/storj-secrets.yaml rename to library/ix-dev/charts/storj/templates/storj-secrets.yaml diff --git a/charts/storj/upgrade_info.json b/library/ix-dev/charts/storj/upgrade_info.json similarity index 100% rename from charts/storj/upgrade_info.json rename to library/ix-dev/charts/storj/upgrade_info.json diff --git a/charts/storj/upgrade_strategy_disable b/library/ix-dev/charts/storj/upgrade_strategy_disable similarity index 100% rename from charts/storj/upgrade_strategy_disable rename to library/ix-dev/charts/storj/upgrade_strategy_disable diff --git a/charts/storj/1.0.5/ix_values.yaml b/library/ix-dev/charts/storj/values.yaml similarity index 100% rename from charts/storj/1.0.5/ix_values.yaml rename to library/ix-dev/charts/storj/values.yaml