diff --git a/library/common/2104.0.0/templates/lib/networking/_dns.tpl b/library/common/2104.0.0/templates/lib/networking/_dns.tpl deleted file mode 100644 index c95d374616..0000000000 --- a/library/common/2104.0.0/templates/lib/networking/_dns.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{/* -DNS Configuration -*/}} -{{- define "common.networking.dnsConfiguration" }} -dnsPolicy: {{ .Values.dnsPolicy }} -{{- if .Values.dnsConfig }} -dnsConfig: - {{- toYaml .Values.dnsConfig | nindent 2 }} -{{- end }} -{{- end }} diff --git a/library/common/2104.0.0/.helmignore b/library/common/2105.0.0/.helmignore similarity index 100% rename from library/common/2104.0.0/.helmignore rename to library/common/2105.0.0/.helmignore diff --git a/library/common/2104.0.0/Chart.yaml b/library/common/2105.0.0/Chart.yaml similarity index 98% rename from library/common/2104.0.0/Chart.yaml rename to library/common/2105.0.0/Chart.yaml index e7f3876268..300110574f 100644 --- a/library/common/2104.0.0/Chart.yaml +++ b/library/common/2105.0.0/Chart.yaml @@ -15,7 +15,7 @@ type: library # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2104.0.0 +version: 2105.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/library/common/2104.0.0/README.md b/library/common/2105.0.0/README.md similarity index 100% rename from library/common/2104.0.0/README.md rename to library/common/2105.0.0/README.md diff --git a/library/common/2104.0.0/templates/_serviceaccount.tpl b/library/common/2105.0.0/templates/_serviceaccount.tpl similarity index 100% rename from library/common/2104.0.0/templates/_serviceaccount.tpl rename to library/common/2105.0.0/templates/_serviceaccount.tpl diff --git a/library/common/2104.0.0/templates/classes/_service.tpl b/library/common/2105.0.0/templates/classes/_service.tpl similarity index 100% rename from library/common/2104.0.0/templates/classes/_service.tpl rename to library/common/2105.0.0/templates/classes/_service.tpl diff --git a/library/common/2104.0.0/templates/classes/_service_ports.tpl b/library/common/2105.0.0/templates/classes/_service_ports.tpl similarity index 100% rename from library/common/2104.0.0/templates/classes/_service_ports.tpl rename to library/common/2105.0.0/templates/classes/_service_ports.tpl diff --git a/library/common/2104.0.0/templates/lib/chart/_annotations.tpl b/library/common/2105.0.0/templates/lib/chart/_annotations.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/chart/_annotations.tpl rename to library/common/2105.0.0/templates/lib/chart/_annotations.tpl diff --git a/library/common/2104.0.0/templates/lib/chart/_capabilities.tpl b/library/common/2105.0.0/templates/lib/chart/_capabilities.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/chart/_capabilities.tpl rename to library/common/2105.0.0/templates/lib/chart/_capabilities.tpl diff --git a/library/common/2104.0.0/templates/lib/chart/_labels.tpl b/library/common/2105.0.0/templates/lib/chart/_labels.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/chart/_labels.tpl rename to library/common/2105.0.0/templates/lib/chart/_labels.tpl diff --git a/library/common/2104.0.0/templates/lib/chart/_names.tpl b/library/common/2105.0.0/templates/lib/chart/_names.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/chart/_names.tpl rename to library/common/2105.0.0/templates/lib/chart/_names.tpl diff --git a/library/common/2104.0.0/templates/lib/containers/_environment.tpl b/library/common/2105.0.0/templates/lib/containers/_environment.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/containers/_environment.tpl rename to library/common/2105.0.0/templates/lib/containers/_environment.tpl diff --git a/library/common/2104.0.0/templates/lib/containers/_image.tpl b/library/common/2105.0.0/templates/lib/containers/_image.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/containers/_image.tpl rename to library/common/2105.0.0/templates/lib/containers/_image.tpl diff --git a/library/common/2104.0.0/templates/lib/containers/_resource.tpl b/library/common/2105.0.0/templates/lib/containers/_resource.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/containers/_resource.tpl rename to library/common/2105.0.0/templates/lib/containers/_resource.tpl diff --git a/library/common/2104.0.0/templates/lib/deployments/_utils.tpl b/library/common/2105.0.0/templates/lib/deployments/_utils.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/deployments/_utils.tpl rename to library/common/2105.0.0/templates/lib/deployments/_utils.tpl diff --git a/library/common/2105.0.0/templates/lib/networking/_dns.tpl b/library/common/2105.0.0/templates/lib/networking/_dns.tpl new file mode 100644 index 0000000000..3a748a4aae --- /dev/null +++ b/library/common/2105.0.0/templates/lib/networking/_dns.tpl @@ -0,0 +1,12 @@ +{{/* +DNS Configuration +*/}} +{{- define "common.networking.dnsConfiguration" }} +{{ if .dnsPolicy }} +dnsPolicy: {{ .dnsPolicy }} +{{ end }} +{{ if .dnsConfig }} +dnsConfig: + {{ toYaml .dnsConfig | nindent 2 }} +{{ end }} +{{- end }} diff --git a/library/common/2104.0.0/templates/lib/resources/_certs.tpl b/library/common/2105.0.0/templates/lib/resources/_certs.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/resources/_certs.tpl rename to library/common/2105.0.0/templates/lib/resources/_certs.tpl diff --git a/library/common/2104.0.0/templates/lib/schema/_utils.tpl b/library/common/2105.0.0/templates/lib/schema/_utils.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/schema/_utils.tpl rename to library/common/2105.0.0/templates/lib/schema/_utils.tpl diff --git a/library/common/2104.0.0/templates/lib/storage/_appStorage.tpl b/library/common/2105.0.0/templates/lib/storage/_appStorage.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/storage/_appStorage.tpl rename to library/common/2105.0.0/templates/lib/storage/_appStorage.tpl diff --git a/library/common/2104.0.0/templates/lib/storage/_ixvolumes.tpl b/library/common/2105.0.0/templates/lib/storage/_ixvolumes.tpl similarity index 100% rename from library/common/2104.0.0/templates/lib/storage/_ixvolumes.tpl rename to library/common/2105.0.0/templates/lib/storage/_ixvolumes.tpl diff --git a/test/chia/1.0.0/Chart.yaml b/test/chia/1.0.0/Chart.yaml index ad2b94a969..070995e077 100644 --- a/test/chia/1.0.0/Chart.yaml +++ b/test/chia/1.0.0/Chart.yaml @@ -14,5 +14,5 @@ sources: - https://github.com/orgs/chia-network/packages/container/package/chia dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/chia/1.0.0/charts/common-2104.0.0.tgz b/test/chia/1.0.0/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/chia/1.0.0/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/chia/1.0.0/charts/common-2105.0.0.tgz b/test/chia/1.0.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/chia/1.0.0/charts/common-2105.0.0.tgz differ diff --git a/test/chia/1.0.0/requirements.lock b/test/chia/1.0.0/requirements.lock index 5c4530719f..5bd5487858 100644 --- a/test/chia/1.0.0/requirements.lock +++ b/test/chia/1.0.0/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:30.006044+05:00" + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.493091+05:00" diff --git a/test/ipfs/1.0.2/charts/common-2104.0.0.tgz b/test/ipfs/1.0.2/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/ipfs/1.0.2/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/ipfs/1.0.2/requirements.lock b/test/ipfs/1.0.2/requirements.lock deleted file mode 100644 index 5c4530719f..0000000000 --- a/test/ipfs/1.0.2/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:30.006044+05:00" diff --git a/test/ipfs/1.0.2/.helmignore b/test/ipfs/1.1.0/.helmignore similarity index 100% rename from test/ipfs/1.0.2/.helmignore rename to test/ipfs/1.1.0/.helmignore diff --git a/test/ipfs/1.0.2/Chart.yaml b/test/ipfs/1.1.0/Chart.yaml similarity index 80% rename from test/ipfs/1.0.2/Chart.yaml rename to test/ipfs/1.1.0/Chart.yaml index 475fe39308..e0336e6aed 100644 --- a/test/ipfs/1.0.2/Chart.yaml +++ b/test/ipfs/1.1.0/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Global, Versioned, peer-to-peer filesystem. name: ipfs -version: 1.0.2 +version: 1.1.0 appVersion: v0.8.0 keywords: - storage @@ -14,5 +14,5 @@ sources: upstream_version: 0.8.0-rc1 dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/ipfs/1.0.2/README.md b/test/ipfs/1.1.0/README.md similarity index 100% rename from test/ipfs/1.0.2/README.md rename to test/ipfs/1.1.0/README.md diff --git a/test/ipfs/1.0.2/app-readme.md b/test/ipfs/1.1.0/app-readme.md similarity index 100% rename from test/ipfs/1.0.2/app-readme.md rename to test/ipfs/1.1.0/app-readme.md diff --git a/test/ipfs/1.1.0/charts/common-2105.0.0.tgz b/test/ipfs/1.1.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/ipfs/1.1.0/charts/common-2105.0.0.tgz differ diff --git a/test/ipfs/1.0.2/default_values.yaml b/test/ipfs/1.1.0/default_values.yaml similarity index 100% rename from test/ipfs/1.0.2/default_values.yaml rename to test/ipfs/1.1.0/default_values.yaml diff --git a/test/ipfs/1.0.2/ix_values.yaml b/test/ipfs/1.1.0/ix_values.yaml similarity index 100% rename from test/ipfs/1.0.2/ix_values.yaml rename to test/ipfs/1.1.0/ix_values.yaml diff --git a/test/ipfs/1.0.2/questions.yaml b/test/ipfs/1.1.0/questions.yaml similarity index 85% rename from test/ipfs/1.0.2/questions.yaml rename to test/ipfs/1.1.0/questions.yaml index 7e3346a820..232ff66070 100644 --- a/test/ipfs/1.0.2/questions.yaml +++ b/test/ipfs/1.1.0/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Configure Storage for IPFS" - name: "IPFS Configuration" description: "Configure Storage for IPFS" + - name: "Advanced DNS Settings" + description: "Configure DNS settings" portals: web_portal: @@ -19,6 +21,34 @@ portals: path: "/webui" questions: + + - variable: dnsConfig + label: "DNS Configuration" + group: "Advanced DNS Settings" + schema: + type: dict + attrs: + - variable: options + label: "DNS Options" + schema: + type: list + items: + - variable: optionsEntry + label: "Option Entry Configuration" + schema: + type: dict + attrs: + - variable: name + label: "Option Name" + schema: + type: string + required: true + - variable: value + label: "Option Value" + schema: + type: string + required: true + - variable: updateStrategy label: "IPFS update strategy" group: "Workload Configuration" diff --git a/test/ipfs/1.1.0/requirements.lock b/test/ipfs/1.1.0/requirements.lock new file mode 100644 index 0000000000..9af05d743a --- /dev/null +++ b/test/ipfs/1.1.0/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.352903+05:00" diff --git a/test/ipfs/1.0.2/templates/NOTES.txt b/test/ipfs/1.1.0/templates/NOTES.txt similarity index 100% rename from test/ipfs/1.0.2/templates/NOTES.txt rename to test/ipfs/1.1.0/templates/NOTES.txt diff --git a/test/ipfs/1.0.2/templates/deployment.yaml b/test/ipfs/1.1.0/templates/deployment.yaml similarity index 97% rename from test/ipfs/1.0.2/templates/deployment.yaml rename to test/ipfs/1.1.0/templates/deployment.yaml index c830a17a16..822817e453 100644 --- a/test/ipfs/1.0.2/templates/deployment.yaml +++ b/test/ipfs/1.1.0/templates/deployment.yaml @@ -55,4 +55,5 @@ spec: - name: gateway containerPort: 9880 {{ include "common.containers.allEnvironmentVariables" .Values | nindent 10 }} +{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} diff --git a/test/ipfs/1.0.2/templates/service.yaml b/test/ipfs/1.1.0/templates/service.yaml similarity index 100% rename from test/ipfs/1.0.2/templates/service.yaml rename to test/ipfs/1.1.0/templates/service.yaml diff --git a/test/ipfs/1.0.2/templates/serviceaccount.yaml b/test/ipfs/1.1.0/templates/serviceaccount.yaml similarity index 100% rename from test/ipfs/1.0.2/templates/serviceaccount.yaml rename to test/ipfs/1.1.0/templates/serviceaccount.yaml diff --git a/test/ipfs/1.0.2/test_values.yaml b/test/ipfs/1.1.0/test_values.yaml similarity index 94% rename from test/ipfs/1.0.2/test_values.yaml rename to test/ipfs/1.1.0/test_values.yaml index a0ada7d3dd..9b6d8652f3 100644 --- a/test/ipfs/1.0.2/test_values.yaml +++ b/test/ipfs/1.1.0/test_values.yaml @@ -25,3 +25,6 @@ appVolumeMounts: data: emptyDir: true mountPath: "/data/ipfs" + +dnsConfig: + options: [] diff --git a/test/ipfs/1.0.2/values.yaml b/test/ipfs/1.1.0/values.yaml similarity index 100% rename from test/ipfs/1.0.2/values.yaml rename to test/ipfs/1.1.0/values.yaml diff --git a/test/ix-chart/2105.0.0/Chart.lock b/test/ix-chart/2105.0.0/Chart.lock index faa4f024ec..be2b86fc9b 100644 --- a/test/ix-chart/2105.0.0/Chart.lock +++ b/test/ix-chart/2105.0.0/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:30.065733+05:00" + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.387798+05:00" diff --git a/test/ix-chart/2105.0.0/Chart.yaml b/test/ix-chart/2105.0.0/Chart.yaml index d5979788eb..409830fb9a 100644 --- a/test/ix-chart/2105.0.0/Chart.yaml +++ b/test/ix-chart/2105.0.0/Chart.yaml @@ -23,6 +23,6 @@ version: 2105.0.0 appVersion: v1 dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/ix-chart/2105.0.0/charts/common-2104.0.0.tgz b/test/ix-chart/2105.0.0/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/ix-chart/2105.0.0/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/ix-chart/2105.0.0/charts/common-2105.0.0.tgz b/test/ix-chart/2105.0.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/ix-chart/2105.0.0/charts/common-2105.0.0.tgz differ diff --git a/test/minio/1.2.1/charts/common-2104.0.0.tgz b/test/minio/1.2.1/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/minio/1.2.1/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/minio/1.2.1/requirements.lock b/test/minio/1.2.1/requirements.lock deleted file mode 100644 index f9ec283999..0000000000 --- a/test/minio/1.2.1/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:30.123288+05:00" diff --git a/test/minio/1.2.1/.helmignore b/test/minio/1.3.0/.helmignore similarity index 100% rename from test/minio/1.2.1/.helmignore rename to test/minio/1.3.0/.helmignore diff --git a/test/minio/1.2.1/Chart.yaml b/test/minio/1.3.0/Chart.yaml similarity index 80% rename from test/minio/1.2.1/Chart.yaml rename to test/minio/1.3.0/Chart.yaml index 83b0680cd8..d7e833c0f2 100644 --- a/test/minio/1.2.1/Chart.yaml +++ b/test/minio/1.3.0/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: High Performance, Kubernetes Native Object Storage name: minio -version: 1.2.1 +version: 1.3.0 appVersion: RELEASE.2021-02-19T04-38-02Z keywords: - storage @@ -15,5 +15,5 @@ sources: upstream_version: 8.0.5 dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/minio/1.2.1/README.md b/test/minio/1.3.0/README.md similarity index 100% rename from test/minio/1.2.1/README.md rename to test/minio/1.3.0/README.md diff --git a/test/minio/1.2.1/app-readme.md b/test/minio/1.3.0/app-readme.md similarity index 100% rename from test/minio/1.2.1/app-readme.md rename to test/minio/1.3.0/app-readme.md diff --git a/test/minio/1.3.0/charts/common-2105.0.0.tgz b/test/minio/1.3.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/minio/1.3.0/charts/common-2105.0.0.tgz differ diff --git a/test/minio/1.2.1/default_values.yaml b/test/minio/1.3.0/default_values.yaml similarity index 100% rename from test/minio/1.2.1/default_values.yaml rename to test/minio/1.3.0/default_values.yaml diff --git a/test/minio/1.2.1/ix_values.yaml b/test/minio/1.3.0/ix_values.yaml similarity index 100% rename from test/minio/1.2.1/ix_values.yaml rename to test/minio/1.3.0/ix_values.yaml diff --git a/test/minio/1.2.1/migrations/migrate_from_1.0.0 b/test/minio/1.3.0/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.2.1/migrations/migrate_from_1.0.0 rename to test/minio/1.3.0/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.2.1/questions.yaml b/test/minio/1.3.0/questions.yaml similarity index 82% rename from test/minio/1.2.1/questions.yaml rename to test/minio/1.3.0/questions.yaml index 19fd540b8d..6b81889084 100644 --- a/test/minio/1.2.1/questions.yaml +++ b/test/minio/1.3.0/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Configure Storage for Nextcloud" - name: "Minio Configuration" description: "Configure Minio credentials" + - name: "Advanced DNS Settings" + description: "Configure DNS settings" portals: web_portal: @@ -18,6 +20,34 @@ portals: - "$variable-service.nodePort" questions: + + - variable: dnsConfig + label: "DNS Configuration" + group: "Advanced DNS Settings" + schema: + type: dict + attrs: + - variable: options + label: "DNS Options" + schema: + type: list + items: + - variable: optionsEntry + label: "Option Entry Configuration" + schema: + type: dict + attrs: + - variable: name + label: "Option Name" + schema: + type: string + required: true + - variable: value + label: "Option Value" + schema: + type: string + required: true + - variable: updateStrategy label: "Minio update strategy" group: "Workload Configuration" diff --git a/test/minio/1.3.0/requirements.lock b/test/minio/1.3.0/requirements.lock new file mode 100644 index 0000000000..28e1370a83 --- /dev/null +++ b/test/minio/1.3.0/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.423192+05:00" diff --git a/test/minio/1.2.1/templates/NOTES.txt b/test/minio/1.3.0/templates/NOTES.txt similarity index 100% rename from test/minio/1.2.1/templates/NOTES.txt rename to test/minio/1.3.0/templates/NOTES.txt diff --git a/test/minio/1.2.1/templates/_cert.tpl b/test/minio/1.3.0/templates/_cert.tpl similarity index 100% rename from test/minio/1.2.1/templates/_cert.tpl rename to test/minio/1.3.0/templates/_cert.tpl diff --git a/test/minio/1.2.1/templates/_helpers.tpl b/test/minio/1.3.0/templates/_helpers.tpl similarity index 100% rename from test/minio/1.2.1/templates/_helpers.tpl rename to test/minio/1.3.0/templates/_helpers.tpl diff --git a/test/minio/1.2.1/templates/configmap.yaml b/test/minio/1.3.0/templates/configmap.yaml similarity index 100% rename from test/minio/1.2.1/templates/configmap.yaml rename to test/minio/1.3.0/templates/configmap.yaml diff --git a/test/minio/1.2.1/templates/deployment.yaml b/test/minio/1.3.0/templates/deployment.yaml similarity index 96% rename from test/minio/1.2.1/templates/deployment.yaml rename to test/minio/1.3.0/templates/deployment.yaml index f6eb4c5c90..ae1a9f78ec 100644 --- a/test/minio/1.2.1/templates/deployment.yaml +++ b/test/minio/1.3.0/templates/deployment.yaml @@ -43,5 +43,6 @@ spec: {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} +{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} {{- include "minio.tlsKeysVolume" . | nindent 8 }} diff --git a/test/minio/1.2.1/templates/secrets.yaml b/test/minio/1.3.0/templates/secrets.yaml similarity index 100% rename from test/minio/1.2.1/templates/secrets.yaml rename to test/minio/1.3.0/templates/secrets.yaml diff --git a/test/minio/1.2.1/templates/service.yaml b/test/minio/1.3.0/templates/service.yaml similarity index 100% rename from test/minio/1.2.1/templates/service.yaml rename to test/minio/1.3.0/templates/service.yaml diff --git a/test/minio/1.2.1/templates/serviceaccount.yaml b/test/minio/1.3.0/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.2.1/templates/serviceaccount.yaml rename to test/minio/1.3.0/templates/serviceaccount.yaml diff --git a/test/minio/1.2.1/test_values.yaml b/test/minio/1.3.0/test_values.yaml similarity index 95% rename from test/minio/1.2.1/test_values.yaml rename to test/minio/1.3.0/test_values.yaml index ce8e11fdac..99b2cf30c7 100644 --- a/test/minio/1.2.1/test_values.yaml +++ b/test/minio/1.3.0/test_values.yaml @@ -21,3 +21,7 @@ appVolumeMounts: export: emptyDir: true mountPath: "/export" + + +dnsConfig: + options: [] diff --git a/test/minio/1.2.1/values.yaml b/test/minio/1.3.0/values.yaml similarity index 100% rename from test/minio/1.2.1/values.yaml rename to test/minio/1.3.0/values.yaml diff --git a/test/nextcloud/1.2.2/Chart.lock b/test/nextcloud/1.2.2/Chart.lock deleted file mode 100644 index 4f042a223a..0000000000 --- a/test/nextcloud/1.2.2/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:29.942145+05:00" diff --git a/test/nextcloud/1.2.2/charts/common-2104.0.0.tgz b/test/nextcloud/1.2.2/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/nextcloud/1.2.2/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/nextcloud/1.2.2/.helmignore b/test/nextcloud/1.3.0/.helmignore similarity index 100% rename from test/nextcloud/1.2.2/.helmignore rename to test/nextcloud/1.3.0/.helmignore diff --git a/test/nextcloud/1.3.0/Chart.lock b/test/nextcloud/1.3.0/Chart.lock new file mode 100644 index 0000000000..9395bdf3f9 --- /dev/null +++ b/test/nextcloud/1.3.0/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.317071+05:00" diff --git a/test/nextcloud/1.2.2/Chart.yaml b/test/nextcloud/1.3.0/Chart.yaml similarity index 83% rename from test/nextcloud/1.2.2/Chart.yaml rename to test/nextcloud/1.3.0/Chart.yaml index f7b460ae6e..ab14879c01 100644 --- a/test/nextcloud/1.2.2/Chart.yaml +++ b/test/nextcloud/1.3.0/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 1.2.2 +version: 1.3.0 appVersion: 20.0.7 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: @@ -17,6 +17,6 @@ sources: upstream_version: 2.3.2 dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/nextcloud/1.2.2/README.md b/test/nextcloud/1.3.0/README.md similarity index 100% rename from test/nextcloud/1.2.2/README.md rename to test/nextcloud/1.3.0/README.md diff --git a/test/nextcloud/1.2.2/app-readme.md b/test/nextcloud/1.3.0/app-readme.md similarity index 100% rename from test/nextcloud/1.2.2/app-readme.md rename to test/nextcloud/1.3.0/app-readme.md diff --git a/test/nextcloud/1.3.0/charts/common-2105.0.0.tgz b/test/nextcloud/1.3.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/nextcloud/1.3.0/charts/common-2105.0.0.tgz differ diff --git a/test/nextcloud/1.2.2/default_values.yaml b/test/nextcloud/1.3.0/default_values.yaml similarity index 100% rename from test/nextcloud/1.2.2/default_values.yaml rename to test/nextcloud/1.3.0/default_values.yaml diff --git a/test/nextcloud/1.2.2/ix_values.yaml b/test/nextcloud/1.3.0/ix_values.yaml similarity index 100% rename from test/nextcloud/1.2.2/ix_values.yaml rename to test/nextcloud/1.3.0/ix_values.yaml diff --git a/test/nextcloud/1.2.2/migrations/migrate_from_1.1.0 b/test/nextcloud/1.3.0/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.2.2/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.3.0/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.2.2/questions.yaml b/test/nextcloud/1.3.0/questions.yaml similarity index 88% rename from test/nextcloud/1.2.2/questions.yaml rename to test/nextcloud/1.3.0/questions.yaml index ffc8d36a72..a92be45e6a 100644 --- a/test/nextcloud/1.2.2/questions.yaml +++ b/test/nextcloud/1.3.0/questions.yaml @@ -11,6 +11,8 @@ groups: description: "Configure Postgresql for nextcloud" - name: "Scaling/Upgrade Policy" description: "Configure how pods are replaced when configuration is upgraded" + - name: "Advanced DNS Settings" + description: "Configure DNS settings" portals: web_portal: @@ -22,6 +24,34 @@ portals: - "$variable-service.nodePort" questions: + + - variable: dnsConfig + label: "DNS Configuration" + group: "Advanced DNS Settings" + schema: + type: dict + attrs: + - variable: options + label: "DNS Options" + schema: + type: list + items: + - variable: optionsEntry + label: "Option Entry Configuration" + schema: + type: dict + attrs: + - variable: name + label: "Option Name" + schema: + type: string + required: true + - variable: value + label: "Option Value" + schema: + type: string + required: true + - variable: nextcloud description: "Nextcloud configuration details" label: "Nextcloud Configuration" diff --git a/test/nextcloud/1.2.2/templates/NOTES.txt b/test/nextcloud/1.3.0/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.2.2/templates/NOTES.txt rename to test/nextcloud/1.3.0/templates/NOTES.txt diff --git a/test/nextcloud/1.2.2/templates/_postgres.tpl b/test/nextcloud/1.3.0/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.2.2/templates/_postgres.tpl rename to test/nextcloud/1.3.0/templates/_postgres.tpl diff --git a/test/nextcloud/1.2.2/templates/backup-postgres-config.yaml b/test/nextcloud/1.3.0/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/backup-postgres-config.yaml rename to test/nextcloud/1.3.0/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.2.2/templates/backup-postgres-hook.yaml b/test/nextcloud/1.3.0/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.3.0/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.2.2/templates/deployment.yaml b/test/nextcloud/1.3.0/templates/deployment.yaml similarity index 97% rename from test/nextcloud/1.2.2/templates/deployment.yaml rename to test/nextcloud/1.3.0/templates/deployment.yaml index db653eac29..49b4f1683b 100644 --- a/test/nextcloud/1.2.2/templates/deployment.yaml +++ b/test/nextcloud/1.3.0/templates/deployment.yaml @@ -52,6 +52,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: extrappvolume-{{ $index }} mountPath: {{ $hostPathConfiguration.mountPath }} {{ end }} +{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - name: extrappvolume-{{ $index }} diff --git a/test/nextcloud/1.2.2/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.3.0/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.3.0/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.2.2/templates/postgres-deployment.yaml b/test/nextcloud/1.3.0/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/postgres-deployment.yaml rename to test/nextcloud/1.3.0/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.2.2/templates/postgres-secret.yaml b/test/nextcloud/1.3.0/templates/postgres-secret.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/postgres-secret.yaml rename to test/nextcloud/1.3.0/templates/postgres-secret.yaml diff --git a/test/nextcloud/1.2.2/templates/postgres-service.yaml b/test/nextcloud/1.3.0/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/postgres-service.yaml rename to test/nextcloud/1.3.0/templates/postgres-service.yaml diff --git a/test/nextcloud/1.2.2/templates/secrets.yaml b/test/nextcloud/1.3.0/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/secrets.yaml rename to test/nextcloud/1.3.0/templates/secrets.yaml diff --git a/test/nextcloud/1.2.2/templates/service.yaml b/test/nextcloud/1.3.0/templates/service.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/service.yaml rename to test/nextcloud/1.3.0/templates/service.yaml diff --git a/test/nextcloud/1.2.2/templates/serviceaccount.yaml b/test/nextcloud/1.3.0/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.2.2/templates/serviceaccount.yaml rename to test/nextcloud/1.3.0/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.2.2/test_values.yaml b/test/nextcloud/1.3.0/test_values.yaml similarity index 97% rename from test/nextcloud/1.2.2/test_values.yaml rename to test/nextcloud/1.3.0/test_values.yaml index 340b234bce..6e765690d5 100644 --- a/test/nextcloud/1.2.2/test_values.yaml +++ b/test/nextcloud/1.3.0/test_values.yaml @@ -41,3 +41,6 @@ postgresAppVolumeMounts: postgres-backup: emptyDir: true mountPath: "/postgres_backups" + +dnsConfig: + options: [] diff --git a/test/nextcloud/1.2.2/values.yaml b/test/nextcloud/1.3.0/values.yaml similarity index 100% rename from test/nextcloud/1.2.2/values.yaml rename to test/nextcloud/1.3.0/values.yaml diff --git a/test/plex/1.4.0/Chart.lock b/test/plex/1.4.0/Chart.lock deleted file mode 100644 index f2a2a94fc0..0000000000 --- a/test/plex/1.4.0/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 -digest: sha256:f0aa221073aafcc5e1602c2a9acb1a508ce72f6847c33dd4a9f9fe10017d5009 -generated: "2021-04-08T16:09:30.181685+05:00" diff --git a/test/plex/1.4.0/charts/common-2104.0.0.tgz b/test/plex/1.4.0/charts/common-2104.0.0.tgz deleted file mode 100644 index 83d4f734c9..0000000000 Binary files a/test/plex/1.4.0/charts/common-2104.0.0.tgz and /dev/null differ diff --git a/test/plex/1.4.0/.helmignore b/test/plex/1.5.0/.helmignore similarity index 100% rename from test/plex/1.4.0/.helmignore rename to test/plex/1.5.0/.helmignore diff --git a/test/plex/1.5.0/Chart.lock b/test/plex/1.5.0/Chart.lock new file mode 100644 index 0000000000..e0a3597a26 --- /dev/null +++ b/test/plex/1.5.0/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.458234+05:00" diff --git a/test/plex/1.4.0/Chart.yaml b/test/plex/1.5.0/Chart.yaml similarity index 80% rename from test/plex/1.4.0/Chart.yaml rename to test/plex/1.5.0/Chart.yaml index e2cd451f60..cba74779f0 100644 --- a/test/plex/1.4.0/Chart.yaml +++ b/test/plex/1.5.0/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 1.21.3.4046-3c1c83ba4 description: Plex Media Server name: plex -version: 1.4.0 +version: 1.5.0 keywords: - plex home: https://plex.tv/ @@ -13,6 +13,6 @@ sources: upstream_version: 2.1.0 dependencies: - name: common - repository: file://../../../library/common/2104.0.0 - version: 2104.0.0 + repository: file://../../../library/common/2105.0.0 + version: 2105.0.0 diff --git a/test/plex/1.4.0/README.md b/test/plex/1.5.0/README.md similarity index 100% rename from test/plex/1.4.0/README.md rename to test/plex/1.5.0/README.md diff --git a/test/plex/1.4.0/app-readme.md b/test/plex/1.5.0/app-readme.md similarity index 100% rename from test/plex/1.4.0/app-readme.md rename to test/plex/1.5.0/app-readme.md diff --git a/test/plex/1.5.0/charts/common-2105.0.0.tgz b/test/plex/1.5.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..6a406ffcec Binary files /dev/null and b/test/plex/1.5.0/charts/common-2105.0.0.tgz differ diff --git a/test/plex/1.4.0/default_values.yaml b/test/plex/1.5.0/default_values.yaml similarity index 100% rename from test/plex/1.4.0/default_values.yaml rename to test/plex/1.5.0/default_values.yaml diff --git a/test/plex/1.4.0/ix_values.yaml b/test/plex/1.5.0/ix_values.yaml similarity index 100% rename from test/plex/1.4.0/ix_values.yaml rename to test/plex/1.5.0/ix_values.yaml diff --git a/test/plex/1.4.0/migrations/migrate_from_1.0.0 b/test/plex/1.5.0/migrations/migrate_from_1.0.0 similarity index 100% rename from test/plex/1.4.0/migrations/migrate_from_1.0.0 rename to test/plex/1.5.0/migrations/migrate_from_1.0.0 diff --git a/test/plex/1.4.0/questions.yaml b/test/plex/1.5.0/questions.yaml similarity index 91% rename from test/plex/1.4.0/questions.yaml rename to test/plex/1.5.0/questions.yaml index e69865b8ae..801d1c9248 100644 --- a/test/plex/1.4.0/questions.yaml +++ b/test/plex/1.5.0/questions.yaml @@ -19,6 +19,8 @@ groups: description: "Configure when pod should be restarted in case of failure" - name: "Resource Reservation" description: "Specify resources to be allocated to workload" + - name: "Advanced DNS Settings" + description: "Configure DNS settings" portals: web_portal: @@ -31,6 +33,34 @@ portals: path: "/web" questions: + + - variable: dnsConfig + label: "DNS Configuration" + group: "Advanced DNS Settings" + schema: + type: dict + attrs: + - variable: options + label: "DNS Options" + schema: + type: list + items: + - variable: optionsEntry + label: "Option Entry Configuration" + schema: + type: dict + attrs: + - variable: name + label: "Option Name" + schema: + type: string + required: true + - variable: value + label: "Option Value" + schema: + type: string + required: true + - variable: claimToken label: "Plex Claim Token" group: "Plex Configuration" diff --git a/test/plex/1.4.0/templates/NOTES.txt b/test/plex/1.5.0/templates/NOTES.txt similarity index 100% rename from test/plex/1.4.0/templates/NOTES.txt rename to test/plex/1.5.0/templates/NOTES.txt diff --git a/test/plex/1.4.0/templates/deployment.yaml b/test/plex/1.5.0/templates/deployment.yaml similarity index 98% rename from test/plex/1.4.0/templates/deployment.yaml rename to test/plex/1.5.0/templates/deployment.yaml index a0b0b465ee..b54a4de670 100644 --- a/test/plex/1.4.0/templates/deployment.yaml +++ b/test/plex/1.5.0/templates/deployment.yaml @@ -81,6 +81,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} initialDelaySeconds: 5 failureThreshold: 40 periodSeconds: 15 + {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} - name: plex-probe-check configMap: diff --git a/test/plex/1.4.0/templates/probe_config.yaml b/test/plex/1.5.0/templates/probe_config.yaml similarity index 100% rename from test/plex/1.4.0/templates/probe_config.yaml rename to test/plex/1.5.0/templates/probe_config.yaml diff --git a/test/plex/1.4.0/templates/service-tcp.yaml b/test/plex/1.5.0/templates/service-tcp.yaml similarity index 100% rename from test/plex/1.4.0/templates/service-tcp.yaml rename to test/plex/1.5.0/templates/service-tcp.yaml diff --git a/test/plex/1.4.0/templates/service-udp.yaml b/test/plex/1.5.0/templates/service-udp.yaml similarity index 100% rename from test/plex/1.4.0/templates/service-udp.yaml rename to test/plex/1.5.0/templates/service-udp.yaml diff --git a/test/plex/1.4.0/test_values.yaml b/test/plex/1.5.0/test_values.yaml similarity index 98% rename from test/plex/1.4.0/test_values.yaml rename to test/plex/1.5.0/test_values.yaml index cfb8ac7e36..193c0fe331 100644 --- a/test/plex/1.4.0/test_values.yaml +++ b/test/plex/1.5.0/test_values.yaml @@ -78,3 +78,6 @@ appVolumeMounts: shared-logs: emptyDir: true mountPath: "/config/Library/Application Support/Plex Media Server/Logs" + +dnsConfig: + options: [] diff --git a/test/plex/1.4.0/values.yaml b/test/plex/1.5.0/values.yaml similarity index 100% rename from test/plex/1.4.0/values.yaml rename to test/plex/1.5.0/values.yaml