fkf9
/
ungleich-k8s
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add release name into domain

This commit is contained in:
Nico Schottelius 2021-06-19 20:11:19 +02:00
parent e49241afce
commit abef1d9c38
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/nginx-certbot-helm/Chart.yaml
View File

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.1 version: 0.1.2
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to

2
apps/nginx-certbot-helm/templates/certbot-job.yaml
View File

@ -17,7 +17,7 @@ spec:
- containerPort: 80 - containerPort: 80
env: env:
- name: DOMAIN - name: DOMAIN
value: "{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" value: "{{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}"
- name: EMAIL - name: EMAIL
value: "{{ .Values.email }}" value: "{{ .Values.email }}"
volumeMounts: volumeMounts:

6
apps/nginx-certbot-helm/templates/configmap.yaml
View File

@ -9,10 +9,10 @@ data:
listen 443 ssl; listen 443 ssl;
listen [::]:443 ssl; listen [::]:443 ssl;
server_name {{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}; server_name {{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }};
ssl_certificate /etc/letsencrypt/live/{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/fullchain.pem; ssl_certificate /etc/letsencrypt/live/{{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/{{ .Release.Name }}-{{ .Values.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/privkey.pem;
client_max_body_size 256m; client_max_body_size 256m;

6
apps/nginx-certbot-helm/templates/deployment.yaml
View File

@ -20,7 +20,7 @@ spec:
- containerPort: 80 - containerPort: 80
- containerPort: 443 - containerPort: 443
volumeMounts: volumeMounts:
- name: nginx-config-443 - name: nginx-config
mountPath: "/etc/nginx/conf.d/" mountPath: "/etc/nginx/conf.d/"
- name: etcletsencrypt - name: etcletsencrypt
mountPath: "/etc/letsencrypt" mountPath: "/etc/letsencrypt"
@ -40,9 +40,9 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ .Release.Name }}-tls1 name: {{ .Release.Name }}-{{ .Values.serviceName }}
labels: labels:
app: {{ .Release.Name }}-tls1 app: {{ .Release.Name }}-{{ .Values.serviceName }}
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports: