Merge pull request #385 from truenas/NAS-115008

NAS-115008 / 22.12 / Add helm tests for applications

charts/collabora/1.0.0/Chart.yaml → charts/collabora/1.1.0/Chart.yaml

@@ -15,4 +15,4 @@ name: collabora
 sources:
 - https://github.com/CollaboraOnline/online.git
 - https://hub.docker.com/r/collabora/code
-version: 1.0.0
+version: 1.1.0

charts/collabora/1.1.0/templates/tests/deployment-check.yaml

@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-collabora-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ks https://{{ $serviceName }}/loleaflet/dist/admin/admin.html
+    restartPolicy: Never

charts/ipfs/1.1.6/default_values.yaml

@@ -1,27 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: ipfs/go-ipfs
-  tag: v0.8.0-rc1
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to ipfs binary
-extraArgs: []
-
-updateStrategy: Recreate
-
-service:
-  swarmPort: 9401
-  apiPort: 9501
-  gatewayPort: 9080
-
-environment:
-
-appVolumeMounts:
-  staging:
-    emptyDir: true
-    mountPath: "/export"
-  data:
-    emptyDir: true
-    mountPath: "/data/ipfs"
-

test/ipfs/1.1.6/Chart.yaml → charts/ipfs/1.2.0/Chart.yaml

@@ -15,4 +15,4 @@ sources:
 - https://github.com/ipfs/go-ipfs
 - https://hub.docker.com/r/ipfs/go-ipfs
 upstream_version: 0.8.0-rc1
-version: 1.1.6
+version: 1.2.0

charts/ipfs/1.2.0/templates/tests/deployment-check.yaml

@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-ipfs-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.apiPort }}/webui/
+    restartPolicy: Never

charts/minio/1.5.10/default_values.yaml

@@ -1,22 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to minio binary
-extraArgs: []
-
-updateStrategy: RollingUpdate
-
-service:
-  nodePort: 9000
-
-environment:
-  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
-
-appVolumeMounts:
-  export:
-    emptyDir: true
-    mountPath: "/export"

charts/minio/1.5.10/Chart.yaml → charts/minio/1.6.0/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: '2022-03-22'
+appVersion: '2022-03-17'
 dependencies:
 - name: common
   repository: file://../../../library/common/2112.0.0
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.5.10
+version: 1.6.0

charts/minio/1.5.10/ix_values.yaml → charts/minio/1.6.0/ix_values.yaml

@@ -1,6 +1,6 @@
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 runAsGroup: 473
 runAsUser: 473

charts/minio/1.6.0/templates/tests/deployment-check.yaml

@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-minio-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.consolePort }}/
+    restartPolicy: Never

charts/minio/1.5.10/test_values.yaml → charts/minio/1.6.0/test_values.yaml

@@ -13,7 +13,7 @@ extraArgs: []
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 minioDomain: null
 runAsGroup: 473
 runAsUser: 473

test/nextcloud/1.3.13/Chart.yaml → charts/nextcloud/1.4.0/Chart.yaml

@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.3.13
+version: 1.4.0

charts/nextcloud/1.3.13/ix_values.yaml → charts/nextcloud/1.4.0/ix_values.yaml

@@ -7,3 +7,4 @@ nginx:
     pullPolicy: IfNotPresent
     repository: nginx
     tag: 1.21.3
+useServiceNameForHost: false

charts/nextcloud/1.3.13/templates/deployment.yaml → charts/nextcloud/1.4.0/templates/deployment.yaml

@@ -40,7 +40,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
         {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
         {{ end }}
-        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" .Values.nextcloud.host) }}
+        {{ $hostName := .Values.nextcloud.host }}
+        {{ if .Values.useServiceNameForHost }}
+        {{ $hostName = (include "common.names.fullname" .) }}
+        {{ end }}
+        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" $hostName) }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-username") }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-password") }}
         {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}

charts/nextcloud/1.4.0/templates/tests/deployment-check.yaml

@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-nextcloud-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}/login
+    restartPolicy: Never

charts/nextcloud/1.3.13/test_values.yaml → charts/nextcloud/1.4.0/test_values.yaml

@@ -38,3 +38,4 @@ postgresql:
 service:
   nodePort: 31000
 updateStrategy: Recreate
+useServiceNameForHost: true

charts/plex/1.6.25/Chart.yaml → charts/plex/1.7.0/Chart.yaml

@@ -14,4 +14,4 @@ sources:
 - https://hub.docker.com/r/plexinc/pms-docker/
 - https://github.com/k8s-at-home/charts/tree/master/charts/plex
 upstream_version: 2.1.0
-version: 1.6.25
+version: 1.7.0

charts/plex/1.7.0/templates/tests/deployment-check.yaml

@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-plex-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32400/identity
+    restartPolicy: Never