Skip to content

Commit c0b61de

Browse files
author
lijianguo
committed
chore(chart): set the domain depends cert_manager_enabled
1 parent 63b0217 commit c0b61de

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

charts/passport/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ env:
1717
- name: "TZ"
1818
value: {{ .Values.time_zone | default "UTC" | quote }}
1919
- name: "DRYCC_CONTROLLER_DOMAIN"
20+
{{- if eq .Values.global.cert_manager_enabled "true" }}
21+
value: https://drycc.{{ .Values.global.platform_domain }}
22+
{{- else }}
2023
value: http://drycc.{{ .Values.global.platform_domain }}
24+
{{- end }}
2125
- name: SOCIAL_AUTH_DRYCC_CONTROLLER_KEY
2226
valueFrom:
2327
secretKeyRef:

charts/passport/templates/passport-certificate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if eq .Values.global.passport_location "on-cluster" }}
2-
{{- if .Values.global.cert_passport_enabled }}
2+
{{- if .Values.global.cert_manager_enabled }}
33
apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:

charts/passport/templates/passport-ingress.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ spec:
2727
backend:
2828
service:
2929
name: drycc-passport
30-
port:
30+
port:
3131
number: 80
32-
{{ if .Values.global.cert_passport_enabled }}
32+
{{ if .Values.global.cert_manager_enabled }}
3333
tls:
3434
- secretName: drycc-passport-certificate-auto
3535
hosts:

charts/passport/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ global:
7676
# This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
7777
platform_domain: ""
7878
# Whether cert_passport is enabled to automatically generate passport certificates
79-
cert_passport_enabled: "true"
79+
cert_manager_enabled: "true"
8080
passport_location: "on-cluster"

0 commit comments

Comments
 (0)