diff --git a/library/common-test/ci/vpn-gluetun-values.yaml b/library/common-test/ci/vpn-gluetun-values.yaml index 0e6a0b9e..fe00d408 100644 --- a/library/common-test/ci/vpn-gluetun-values.yaml +++ b/library/common-test/ci/vpn-gluetun-values.yaml @@ -36,7 +36,6 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" - args: - --port - '8080' @@ -53,7 +52,7 @@ addons: # @default -- See values.yaml vpn: # -- Specify the VPN type. Valid options are disabled, gluetun or tailscale - type: tailscale + type: gluetun # -- All variables specified here will be added to the vpn sidecar container # See the documentation of the VPN image for all config values diff --git a/library/common-test/ci/vpn-tailscale-values.yaml b/library/common-test/ci/vpn-tailscale-values.yaml index 0e6a0b9e..6f402a1b 100644 --- a/library/common-test/ci/vpn-tailscale-values.yaml +++ b/library/common-test/ci/vpn-tailscale-values.yaml @@ -36,7 +36,6 @@ workload: type: http port: "{{ .Values.service.main.ports.main.port }}" - args: - --port - '8080' diff --git a/library/common/templates/addons/vpn/_gluetunContainer.tpl b/library/common/templates/addons/vpn/_gluetunContainer.tpl index 0692c013..e7284a2a 100644 --- a/library/common/templates/addons/vpn/_gluetunContainer.tpl +++ b/library/common/templates/addons/vpn/_gluetunContainer.tpl @@ -8,10 +8,10 @@ probes: {{- if $.Values.addons.vpn.livenessProbe }} liveness: {{- toYaml . | nindent 2 }} -{{- else -}} +{{- else }} liveness: enabled: false -{{- end -}} +{{- end }} readiness: enabled: false startup: @@ -27,7 +27,7 @@ securityContext: {{- with $.Values.addons.vpn.env }} env: {{- . | toYaml | nindent 2 }} -{{- end }} +{{- end -}} {{- range $envList := $.Values.addons.vpn.envList -}} {{- if and $envList.name $envList.value }} diff --git a/library/common/templates/addons/vpn/_tailscaleContainer.tpl b/library/common/templates/addons/vpn/_tailscaleContainer.tpl index d40d1461..75413e57 100644 --- a/library/common/templates/addons/vpn/_tailscaleContainer.tpl +++ b/library/common/templates/addons/vpn/_tailscaleContainer.tpl @@ -8,10 +8,10 @@ probes: {{- if $.Values.addons.vpn.livenessProbe }} liveness: {{- toYaml . | nindent 2 }} -{{- else -}} +{{- else }} liveness: enabled: false -{{- end -}} +{{- end }} readiness: enabled: false startup: