[stable/nextcloud] fix loadbalancer servicetype / remove flaky test (#13696)

Signed-off-by: Christian Ingenhaag <christian.ingenhaag@googlemail.com>

stable/nextcloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nextcloud
-version: 1.0.3
+version: 1.0.4
 appVersion: 15.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:

stable/nextcloud/templates/_helpers.tpl

@@ -32,27 +32,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Get the user defined LoadBalancerIP for this release.
-Note, returns 127.0.0.1 if using ClusterIP.
-*/}}
-{{- define "nextcloud.serviceIP" -}}
-{{- if eq .Values.service.type "ClusterIP" -}}
-127.0.0.1
-{{- else -}}
-{{- index .Values (printf "%sLoadBalancerIP" .Chart.Name) | default "" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Gets the host to be used for this application.
-If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty.
-*/}}
-{{- define "nextcloud.host" -}}
-{{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}}
-{{- default (include "nextcloud.serviceIP" .) $host -}}
-{{- end -}}
-
 {{/*
 Create chart name and version as used by the chart label.
 */}}

stable/nextcloud/templates/deployment.yaml

@@ -1,4 +1,3 @@
-{{- if include "nextcloud.host" . -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -89,7 +88,7 @@ spec:
             port: http
             httpHeaders:
             - name: Host
-              value: {{ include "nextcloud.host" . | quote }}
+              value: {{ .Values.nextcloud.host | quote }}
           initialDelaySeconds: 30
           timeoutSeconds: 5
           failureThreshold: 6
@@ -99,7 +98,7 @@ spec:
             port: http
             httpHeaders:
             - name: Host
-              value: {{ include "nextcloud.host" . | quote }}
+              value: {{ .Values.nextcloud.host | quote }}
           initialDelaySeconds: 30
           timeoutSeconds: 3
           periodSeconds: 5
@@ -141,4 +140,3 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
-{{- end -}}

stable/nextcloud/templates/tests/test-connection.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "nextcloud.fullname" . }}-test-connection"
-  labels:
-    app.kubernetes.io/name: {{ include "nextcloud.name" . }}
-    helm.sh/chart: {{ include "nextcloud.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['--header', 'Host: {{ .Values.nextcloud.host }}', '{{ include "nextcloud.fullname" . }}:{{ .Values.service.port }}/status.php']
-  restartPolicy: Never