Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@ jobs:
helm upgrade --install team-devoops infra/helm/team-devoops \
--namespace "$NAMESPACE" \
--set global.image.tag=${{ github.sha }} \
--wait --timeout 5m
--wait --timeout 10m
7 changes: 7 additions & 0 deletions infra/helm/team-devoops/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ metadata:
annotations:
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
{{- if and $tls.enabled $tls.clusterIssuer }}
cert-manager.io/cluster-issuer: {{ $tls.clusterIssuer | quote }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.className }}
{{- if $tls.enabled }}
Expand Down Expand Up @@ -50,6 +53,10 @@ metadata:
name: team-devoops-plain
labels:
{{- include "team-devoops.labels" (dict "name" "ingress-plain" "root" $) | nindent 4 }}
{{- if and $tls.enabled $tls.clusterIssuer }}
annotations:
cert-manager.io/cluster-issuer: {{ $tls.clusterIssuer | quote }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.className }}
{{- if $tls.enabled }}
Expand Down
9 changes: 7 additions & 2 deletions infra/helm/team-devoops/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,13 @@ ingress:
className: nginx
host: ge83mom-devops26.stud.k8s.aet.cit.tum.de
tls:
enabled: false
secretName: ""
enabled: true
# Secret nginx serves the cert from. With cert-manager this is created
# automatically; otherwise it must reference a pre-existing TLS Secret.
secretName: team-devoops-tls
# cert-manager ClusterIssuer that issues the cert (TUM AET cluster).
# Adds the cert-manager.io/cluster-issuer annotation on the ingresses.
clusterIssuer: letsencrypt-prod

# Default compute resources applied to every app container (overridable per service).
resources:
Expand Down
Loading