From b2636b7040b45b26c07bdc8264204271ca27055f Mon Sep 17 00:00:00 2001 From: Lars Seipel <ls@slrz.net> Date: Mon, 3 Jul 2023 15:56:33 +0200 Subject: [PATCH] charts: disable TLS --- .../templates/deployment.yaml | 19 ++++--------------- .../templates/service.yaml | 4 +--- charts/bbbatscale-support-notify/values.yaml | 2 +- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/charts/bbbatscale-support-notify/templates/deployment.yaml b/charts/bbbatscale-support-notify/templates/deployment.yaml index 9987e9a..da565cd 100644 --- a/charts/bbbatscale-support-notify/templates/deployment.yaml +++ b/charts/bbbatscale-support-notify/templates/deployment.yaml @@ -31,11 +31,6 @@ spec: serviceAccountName: {{ include "bbbatscale-support-notify.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} - volumes: - - name: tls - secret: - defaultMode: 420 - secretName: {{ include "bbbatscale-support-notify.fullname" . }}-tls containers: - name: {{ .Chart.Name }} securityContext: @@ -46,18 +41,12 @@ spec: - secretRef: name: {{ include "bbbatscale-support-notify.fullname" . }} env: - - name: NOTIFY_CERT - value: /etc/tls/private/tls.crt - - name: NOTIFY_KEY - value: /etc/tls/private/tls.key + - name: NOTIFY_NOTLS + value: "1" ports: - - name: https - containerPort: 8443 + - name: http + containerPort: 8080 protocol: TCP - volumeMounts: - - mountPath: /etc/tls/private - name: tls - readOnly: true resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/bbbatscale-support-notify/templates/service.yaml b/charts/bbbatscale-support-notify/templates/service.yaml index 328f3ec..3049699 100644 --- a/charts/bbbatscale-support-notify/templates/service.yaml +++ b/charts/bbbatscale-support-notify/templates/service.yaml @@ -4,13 +4,11 @@ metadata: name: {{ include "bbbatscale-support-notify.fullname" . }} labels: {{- include "bbbatscale-support-notify.labels" . | nindent 4 }} - annotations: - service.alpha.openshift.io/serving-cert-secret-name: {{ include "bbbatscale-support-notify.fullname" . }}-tls spec: type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }} - targetPort: 8443 + targetPort: 8080 protocol: TCP name: http selector: diff --git a/charts/bbbatscale-support-notify/values.yaml b/charts/bbbatscale-support-notify/values.yaml index d78ab74..b0977fd 100644 --- a/charts/bbbatscale-support-notify/values.yaml +++ b/charts/bbbatscale-support-notify/values.yaml @@ -51,7 +51,7 @@ securityContext: {} service: type: ClusterIP - port: 8443 + port: 80 ingress: enabled: true -- GitLab