Merge pull request #55 from truenas/NAS-110094

Allow setting DNS options for charts

library/common/2104.0.0/Chart.yaml → 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

library/common/2104.0.0/templates/lib/networking/_dns.tpl → library/common/2105.0.0/templates/lib/networking/_dns.tpl

@@ -2,9 +2,11 @@
 DNS Configuration
 */}}
 {{- define "common.networking.dnsConfiguration" }}
-dnsPolicy: {{ .Values.dnsPolicy }}
-{{- if .Values.dnsConfig }}
+{{ if .dnsPolicy }}
+dnsPolicy: {{ .dnsPolicy }}
+{{ end }}
+{{ if .dnsConfig }}
 dnsConfig:
-  {{- toYaml .Values.dnsConfig | nindent 2 }}
-{{- end }}
+  {{ toYaml .dnsConfig | nindent 2 }}
+{{ end }}
 {{- end }}

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

test/chia/1.0.0/requirements.lock

 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"

test/ipfs/1.0.2/requirements.lock

-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"

test/ipfs/1.0.2/Chart.yaml → test/ipfs/1.1.0/Chart.yaml

 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

test/ipfs/1.0.2/questions.yaml → 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"

test/ipfs/1.1.0/requirements.lock

+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"

test/ipfs/1.0.2/templates/deployment.yaml → 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 }}

test/ipfs/1.0.2/test_values.yaml → test/ipfs/1.1.0/test_values.yaml

@@ -25,3 +25,6 @@ appVolumeMounts:
   data:
     emptyDir: true
     mountPath: "/data/ipfs"
+
+dnsConfig:
+  options: []

test/ix-chart/2105.0.0/Chart.lock

 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"

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
 

test/minio/1.2.1/requirements.lock

-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"

test/minio/1.2.1/Chart.yaml → test/minio/1.3.0/Chart.yaml

 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

test/minio/1.2.1/questions.yaml → 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"

test/minio/1.3.0/requirements.lock

+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"

test/minio/1.2.1/templates/deployment.yaml → 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 }}

test/minio/1.2.1/test_values.yaml → test/minio/1.3.0/test_values.yaml

@@ -21,3 +21,7 @@ appVolumeMounts:
   export:
     emptyDir: true
     mountPath: "/export"
+
+
+dnsConfig:
+  options: []

test/nextcloud/1.2.2/Chart.lock

-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"

test/nextcloud/1.3.0/Chart.lock

+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"

test/nextcloud/1.2.2/Chart.yaml → test/nextcloud/1.3.0/Chart.yaml

 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
 

test/nextcloud/1.2.2/questions.yaml → 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"

test/nextcloud/1.2.2/templates/deployment.yaml → 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 }}

test/nextcloud/1.2.2/test_values.yaml → test/nextcloud/1.3.0/test_values.yaml

@@ -41,3 +41,6 @@ postgresAppVolumeMounts:
   postgres-backup:
     emptyDir: true
     mountPath: "/postgres_backups"
+
+dnsConfig:
+  options: []

test/plex/1.4.0/Chart.lock

-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"

test/plex/1.5.0/Chart.lock

+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"

test/plex/1.4.0/Chart.yaml → 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