Merge branch 'charts-disable-tls' into 'master'

charts: disable TLS

See merge request !1

Dockerfile

-FROM golang:1.15 as builder
+FROM golang:1.20 as builder
 
 WORKDIR /build
 COPY go.mod go.mod

charts/bbbatscale-support-notify/templates/_helpers.tpl

@@ -60,3 +60,16 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "bbbatscale-support-notify.dockerConfig" -}}
+auths:
+  {{- $auths := .auths }}
+  {{- range (keys $auths) }}
+  {{- $auth := get $auths . }}
+  {{ quote . }}:
+    username: {{ quote $auth.username }}
+    password: {{ quote $auth.password }}
+    auth: {{ printf "%s:%s" $auth.username $auth.password | b64enc }}
+    email: {{ get $auth "email" | quote }}
+  {{- end }}
+{{- end -}}

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 }}

charts/bbbatscale-support-notify/templates/image-pull-secret.yaml

+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "bbbatscale-support-notify.fullname" . }}-pullsecret
+  labels:
+    {{- include "bbbatscale-support-notify.labels" . | nindent 4 }}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ include "bbbatscale-support-notify.dockerConfig" .Values.imagePullConfig | fromYaml | toJson | b64enc }}

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:

charts/bbbatscale-support-notify/templates/serviceaccount.yaml

@@ -9,4 +9,6 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+imagePullSecrets:
+  -  {{ include "bbbatscale-support-notify.fullname" . }}-pullsecret
 {{- end }}

charts/bbbatscale-support-notify/values.yaml

@@ -51,7 +51,7 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 8443
+  port: 80
 
 ingress:
   enabled: true