NAS-121410 / 23.10 / Avoid having the same key defined twice (#1106)

* Avoid having the same key defined twice

* Use correct variable names

* quote strings in questions

* test run without upgrade

* revert

library/ix-dev/community/radarr/Chart.yaml

@@ -3,7 +3,7 @@ description: Radarr is a movie collection manager for Usenet and BitTorrent user
 annotations:
   title: Radarr
 type: application
-version: 1.0.0
+version: 1.0.1
 apiVersion: v2
 appVersion: '4.3.2.6857'
 kubeVersion: '>=1.16.0-0'
@@ -18,7 +18,7 @@ home: https://github.com/Radarr/Radarr
 icon: https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png
 sources:
   - https://github.com/onedr0p/containers/tree/main/apps/radarr
-  - https://github.com/truenas/charts/tree/master/charts/radarr
+  - https://github.com/truenas/charts/tree/master/community/radarr
   - https://github.com/Radarr/Radarr
 keywords:
   - media

library/ix-dev/community/radarr/ci/extra-values.yaml

@@ -1,6 +1,6 @@
 radarrConfig:
   additionalEnvs:
-    - name: RADARR__AUTHENTICATION_METHOD
+    - name: RADARR__API_KEY
       value: some-long-api-key
     - name: RADARR__LOG_LEVEL
       value: error

library/ix-dev/community/radarr/questions.yaml

@@ -32,7 +32,7 @@ questions:
           description: The name of the Radarr instance.
           schema:
             type: string
-            default: Radarr
+            default: "Radarr"
             required: true
         - variable: additionalEnvs
           label: Additional Environment Variables
@@ -123,11 +123,11 @@ questions:
                 schema:
                   type: string
                   required: true
-                  default: ixVolume
+                  default: "ixVolume"
                   enum:
-                    - value: hostPath
+                    - value: "hostPath"
                       description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
+                    - value: "ixVolume"
                       description: ixVolume (Dataset created automatically by the system)
               - variable: datasetName
                 label: Dataset Name
@@ -137,7 +137,7 @@ questions:
                   required: true
                   hidden: true
                   immutable: true
-                  default: config
+                  default: "config"
                   $ref:
                     - "normalize/ixVolume"
               - variable: hostPath
@@ -167,11 +167,11 @@ questions:
                       schema:
                         type: string
                         required: true
-                        default: ixVolume
+                        default: "ixVolume"
                         enum:
-                          - value: hostPath
+                          - value: "hostPath"
                             description: Host Path (Path that already exists on the system)
-                          - value: ixVolume
+                          - value: "ixVolume"
                             description: ixVolume (Dataset created automatically by the system)
                     - variable: mountPath
                       label: Mount Path
@@ -214,12 +214,12 @@ questions:
                 description: CPU limit for Radarr.
                 schema:
                   type: string
-                  default: 4000m
+                  default: "4000m"
                   required: true
               - variable: memory
                 label: Memory
                 description: Memory limit for Radarr.
                 schema:
                   type: string
-                  default: 8Gi
+                  default: "8Gi"
                   required: true

library/ix-dev/community/radarr/templates/_radarr.tpl

@@ -14,15 +14,14 @@ workload:
           securityContext:
             runAsUser: {{ .Values.radarrRunAs.user }}
             runAsGroup: {{ .Values.radarrRunAs.group }}
-          {{ with .Values.radarrConfig.additionalEnvs }}
           env:
+            RADARR__PORT: {{ .Values.radarrNetwork.webPort }}
+            RADARR__INSTANCE_NAME: {{ .Values.radarrConfig.instanceName }}
+          {{ with .Values.radarrConfig.additionalEnvs }}
             {{ range $env := . }}
             {{ $env.name }}: {{ $env.value }}
             {{ end }}
           {{ end }}
-          env:
-            RADARR__PORT: {{ .Values.radarrNetwork.webPort }}
-            RADARR__INSTANCE_NAME: {{ .Values.radarrConfig.instanceName }}
           probes:
             liveness:
               enabled: true

library/ix-dev/community/sonarr/Chart.yaml

@@ -3,7 +3,7 @@ description: Sonarr is a PVR for Usenet and BitTorrent users.
 annotations:
   title: Sonarr
 type: application
-version: 1.0.0
+version: 1.0.1
 apiVersion: v2
 appVersion: '3.0.10.1567'
 kubeVersion: '>=1.16.0-0'
@@ -18,7 +18,7 @@ home: https://github.com/Sonarr/Sonarr
 icon: https://raw.githubusercontent.com/Sonarr/Sonarr/develop/Logo/256.png
 sources:
   - https://github.com/onedr0p/containers/tree/main/apps/sonarr
-  - https://github.com/truenas/charts/tree/master/charts/sonarr
+  - https://github.com/truenas/charts/tree/master/community/sonarr
   - https://github.com/Sonarr/Sonarr
 keywords:
   - media

library/ix-dev/community/sonarr/ci/extra-values.yaml

@@ -1,6 +1,6 @@
 sonarrConfig:
   additionalEnvs:
-    - name: SONARR__AUTHENTICATION_METHOD
+    - name: SONARR__API_KEY
       value: some-long-api-key
     - name: SONARR__LOG_LEVEL
       value: error

library/ix-dev/community/sonarr/questions.yaml

@@ -32,7 +32,7 @@ questions:
           description: The name of the Sonarr instance.
           schema:
             type: string
-            default: Sonarr
+            default: "Sonarr"
             required: true
         - variable: additionalEnvs
           label: Additional Environment Variables
@@ -123,11 +123,11 @@ questions:
                 schema:
                   type: string
                   required: true
-                  default: ixVolume
+                  default: "ixVolume"
                   enum:
-                    - value: hostPath
+                    - value: "hostPath"
                       description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
+                    - value: "ixVolume"
                       description: ixVolume (Dataset created automatically by the system)
               - variable: datasetName
                 label: Dataset Name
@@ -137,7 +137,7 @@ questions:
                   required: true
                   hidden: true
                   immutable: true
-                  default: config
+                  default: "config"
                   $ref:
                     - "normalize/ixVolume"
               - variable: hostPath
@@ -167,11 +167,11 @@ questions:
                       schema:
                         type: string
                         required: true
-                        default: ixVolume
+                        default: "ixVolume"
                         enum:
-                          - value: hostPath
+                          - value: "hostPath"
                             description: Host Path (Path that already exists on the system)
-                          - value: ixVolume
+                          - value: "ixVolume"
                             description: ixVolume (Dataset created automatically by the system)
                     - variable: mountPath
                       label: Mount Path
@@ -214,12 +214,12 @@ questions:
                 description: CPU limit for Sonarr.
                 schema:
                   type: string
-                  default: 4000m
+                  default: "4000m"
                   required: true
               - variable: memory
                 label: Memory
                 description: Memory limit for Sonarr.
                 schema:
                   type: string
-                  default: 8Gi
+                  default: "8Gi"
                   required: true

library/ix-dev/community/sonarr/templates/_sonarr.tpl

@@ -14,15 +14,14 @@ workload:
           securityContext:
             runAsUser: {{ .Values.sonarrRunAs.user }}
             runAsGroup: {{ .Values.sonarrRunAs.group }}
-          {{ with .Values.sonarrConfig.additionalEnvs }}
           env:
+            SONARR__PORT: {{ .Values.sonarrNetwork.webPort }}
+            SONARR__INSTANCE_NAME: {{ .Values.sonarrConfig.instanceName }}
+          {{ with .Values.sonarrConfig.additionalEnvs }}
             {{ range $env := . }}
             {{ $env.name }}: {{ $env.value }}
             {{ end }}
           {{ end }}
-          env:
-            SONARR__PORT: {{ .Values.sonarrNetwork.webPort }}
-            SONARR__INSTANCE_NAME: {{ .Values.sonarrConfig.instanceName }}
           probes:
             liveness:
               enabled: true