Skip to content

Commit

Permalink
fix(ckan): change ingress tls template (#968)
Browse files Browse the repository at this point in the history
  • Loading branch information
SyeKlu authored May 16, 2024
1 parent 5a9af56 commit ccd62ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
* @teutonet/k8s
/charts/base-cluster/ @cwrau @marvinWolff @tasches @teutonet-bot
/charts/ckan/ @syeklu @teutonet-bot
/charts/ckan/ @syeklu @cwrau @marvinWolff @tasches @teutonet-bot
/charts/common/ @cwrau @marvinWolff @tasches @teutonet-bot
/charts/stellio-context-broker/ @cwrau @ocaner-biz @teutonet-bot
/charts/t8s-cluster/ @cwrau @marvinWolff @tasches @teutonet-bot
Expand Down
6 changes: 6 additions & 0 deletions charts/ckan/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ appVersion: 2.11.0
maintainers:
- name: syeklu
email: [email protected]
- name: cwrau
email: [email protected]
- name: marvinWolff
email: [email protected]
- name: tasches
email: [email protected]
description: A Helm chart for Kubernetes
dependencies:
- name: common
Expand Down
2 changes: 0 additions & 2 deletions charts/ckan/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ spec:
{{- end }}
{{- if .Values.ckan.ingress.tls }}
tls:
{{- if and .Values.ckan.ingress.tls (or .Values.ckan.ingress.existingSecret (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ckan.ingress.annotations )) .Values.ckan.ingress.selfSigned) }}
- hosts:
- {{ tpl .Values.ckan.ingress.hostname . | quote }}
{{- if .Values.ckan.ingress.existingSecret }}
secretName: {{ .Values.ckan.ingress.existingSecret }}
{{- else }}
secretName: {{ printf "%s-tls" (tpl .Values.ckan.ingress.hostname .) | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

0 comments on commit ccd62ac

Please sign in to comment.