Skip to content

Commit 423e48c

Browse files
Use gateway.rules upstream when gateway is enabled in acaas
The blog/docs/learn/license/selfhost ExternalName services hardcoded ingress.rules.*.upstream, so the newly added gateway.rules.* values had no effect on the actual rendered chart. Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 48c269c commit 423e48c

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

charts/acaas/templates/blog/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: blog
66
namespace: {{ .Release.Namespace }}
77
spec:
8-
externalName: {{ .Values.ingress.rules.blog.upstream }}
8+
externalName: {{ if .Values.gateway.enabled }}{{ .Values.gateway.rules.blog.upstream }}{{ else }}{{ .Values.ingress.rules.blog.upstream }}{{ end }}
99
sessionAffinity: None
1010
type: ExternalName
1111
{{- end }}

charts/acaas/templates/docs/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: docs
66
namespace: {{ .Release.Namespace }}
77
spec:
8-
externalName: {{ .Values.ingress.rules.docs.upstream }}
8+
externalName: {{ if .Values.gateway.enabled }}{{ .Values.gateway.rules.docs.upstream }}{{ else }}{{ .Values.ingress.rules.docs.upstream }}{{ end }}
99
sessionAffinity: None
1010
type: ExternalName
1111
{{- end }}

charts/acaas/templates/learn/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: learn
66
namespace: {{ .Release.Namespace }}
77
spec:
8-
externalName: {{ .Values.ingress.rules.learn.upstream }}
8+
externalName: {{ if .Values.gateway.enabled }}{{ .Values.gateway.rules.learn.upstream }}{{ else }}{{ .Values.ingress.rules.learn.upstream }}{{ end }}
99
sessionAffinity: None
1010
type: ExternalName
1111
{{- end }}

charts/acaas/templates/license/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: license
66
namespace: {{ .Release.Namespace }}
77
spec:
8-
externalName: {{ .Values.ingress.rules.license.upstream }}
8+
externalName: {{ if .Values.gateway.enabled }}{{ .Values.gateway.rules.license.upstream }}{{ else }}{{ .Values.ingress.rules.license.upstream }}{{ end }}
99
sessionAffinity: None
1010
type: ExternalName
1111
{{- end }}

charts/acaas/templates/selfhost/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: selfhost
66
namespace: {{ .Release.Namespace }}
77
spec:
8-
externalName: {{ .Values.ingress.rules.selfhost.upstream }}
8+
externalName: {{ if .Values.gateway.enabled }}{{ .Values.gateway.rules.selfhost.upstream }}{{ else }}{{ .Values.ingress.rules.selfhost.upstream }}{{ end }}
99
sessionAffinity: None
1010
type: ExternalName
1111
{{- end }}

0 commit comments

Comments
 (0)