Commit 4b3ef9f6 authored by Geoff Simmons's avatar Geoff Simmons

Update helm charts for the refactored TLS solution.

Ref #36
parent 0ed73905
...@@ -25,17 +25,6 @@ rules: ...@@ -25,17 +25,6 @@ rules:
- get - get
- list - list
- watch - watch
- apiGroups:
- ""
resources:
- secrets
resourceNames:
- tls-cert
verbs:
- get
- list
- watch
- update
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
......
...@@ -20,14 +20,6 @@ Create a admin secret name ...@@ -20,14 +20,6 @@ Create a admin secret name
{{- printf "%s-admin" (include "viking-service.name" . | trunc 55) -}} {{- printf "%s-admin" (include "viking-service.name" . | trunc 55) -}}
{{- end -}} {{- end -}}
{{/*
Create a TLS secret name
*/}}
{{- define "viking-service.tls-secret-name" -}}
{{/*{{- printf "%s-tls-crt" (include "viking-service.name" . | trunc 55) -}}*/}}
{{- printf "tls-cert" -}}
{{- end -}}
{{/* {{/*
Create a default fully qualified app name. Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
......
...@@ -24,7 +24,7 @@ spec: ...@@ -24,7 +24,7 @@ spec:
port: 5555 port: 5555
targetPort: 5555 targetPort: 5555
protocol: TCP protocol: TCP
- name: faccess - name: crt-dnldr
port: 5556 port: 5556
targetPort: 5556 targetPort: 5556
protocol: TCP protocol: TCP
......
apiVersion: v1 kind: ClusterRole
kind: Secret apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ template "viking-service.tls-secret-name" . }}
labels: labels:
app.kubernetes.io/name: {{ template "viking-service.name" . }} app.kubernetes.io/name: {{ template "viking-service.name" . }}
helm.sh/chart: {{ template "viking-service.chart" . }} helm.sh/chart: {{ template "viking-service.chart" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
viking.uplex.de/secret: pem name: {{ template "viking-service.fullname" . }}
type: Opaque rules:
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: {{ template "viking-service.name" . }}
helm.sh/chart: {{ template "viking-service.chart" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
name: {{ template "viking-service.fullname" . }}
subjects:
- kind: ServiceAccount
name: {{ template "viking-service.fullname" . }}
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: {{ template "viking-service.fullname" . }}
apiGroup: rbac.authorization.k8s.io
...@@ -168,7 +168,6 @@ spec: ...@@ -168,7 +168,6 @@ spec:
volumeMounts: volumeMounts:
- name: tls-cert - name: tls-cert
mountPath: "/etc/ssl/private" mountPath: "/etc/ssl/private"
readOnly: true
- name: run-offload - name: run-offload
mountPath: "/run/offload" mountPath: "/run/offload"
- name: run-haproxy - name: run-haproxy
...@@ -202,9 +201,8 @@ spec: ...@@ -202,9 +201,8 @@ spec:
- key: admin - key: admin
path: _.secret path: _.secret
- name: tls-cert - name: tls-cert
secret: emptyDir:
secretName: {{ template "viking-service.tls-secret-name" . }} medium: "Memory"
defaultMode: 0440
- name: run-varnish-home - name: run-varnish-home
emptyDir: emptyDir:
medium: "Memory" medium: "Memory"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment