Skip to content

Commit c0b7b31

Browse files
committed
move ingres values to a ci-values file
1 parent 6d810d6 commit c0b7b31

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,4 @@ jobs:
8282
--set env.DB_USER="$DB_USER" \
8383
--set env.DB_PASS="$DB_PASS" \
8484
--set env.DB_SSLMODE="$DB_SSLMODE" \
85-
--set ingress.enabled=true \
86-
--set ingress.className=nginx \
87-
--set ingress.hosts[0].host=dblogapp.tpk.pw \
88-
--set ingress.hosts[0].paths[0].path=/ \
89-
--set ingress.hosts[0].paths[0].pathType=Prefix \
90-
--set ingress.annotations.cert-manager\\.io/cluster-issuer="azuredns-tpkpw" \
91-
--set ingress.annotations.kubernetes\\.io/ingress.class="nginx" \
92-
--set ingress.annotations.kubernetes\\.io/tls-acme="true" \
93-
--set ingress.tls[0].hosts[0]=dblogapp.tpk.pw \
94-
--set ingress.tls[0].secretName=dbloghost-tls
85+
-f ci-values.yaml

chart/templates/ingress.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apiVersion: networking.k8s.io/v1
33
kind: Ingress
44
metadata:
55
name: {{ include "dblogapp.fullname" . }}
6+
{{- with .Values.ingress.annotations }}
67
annotations:
7-
{{- with .Values.ingress.annotations }}
88
{{- toYaml . | nindent 4 }}
9-
{{- end }}
10-
# Example annotations:
11-
# kubernetes.io/ingress.class: "nginx" # Set ingress class
12-
# cert-manager.io/cluster-issuer: "letsencrypt-prod" # For cert-manager TLS
9+
{{- end }}
10+
# Example annotations:
11+
# kubernetes.io/ingress.class: "nginx"
12+
# cert-manager.io/cluster-issuer: "letsencrypt-prod"
1313
spec:
1414
{{- if .Values.ingress.className }}
1515
ingressClassName: {{ .Values.ingress.className }}

ci-values.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ingress:
2+
enabled: true
3+
className: nginx
4+
hosts:
5+
- host: dblogapp.tpk.pw
6+
paths:
7+
- path: /
8+
pathType: Prefix
9+
annotations:
10+
cert-manager.io/cluster-issuer: azuredns-tpkpw
11+
kubernetes.io/ingress.class: nginx
12+
kubernetes.io/tls-acme: "true"
13+
tls:
14+
- hosts:
15+
- dblogapp.tpk.pw
16+
secretName: dbloghost-tls

0 commit comments

Comments
 (0)