Skip to content

Commit 1f3bbb9

Browse files
Fix dnsNames in ace cert for acme (#1222)
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 442453e commit 1f3bbb9

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

charts/ace/templates/gateway/route-nats.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ spec:
5454
- group: ""
5555
kind: Secret
5656
name: {{ include "ace.fullname" . }}-cert
57+
{{ if eq (index .Values "global" "platform" "hostType") "ip" }}
5758
hostname: {{ include "ace.fullname" . }}-nats
59+
{{- else }}
60+
hostname: {{ .Values.global.platform.host }}
61+
{{- end }}
5862

5963
---
6064
apiVersion: gateway.networking.k8s.io/v1alpha2

charts/ace/templates/ingress/certificate.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ spec:
1717
kind: Issuer
1818
name: {{ include "ace.fullname" . }}
1919
dnsNames:
20+
{{ if eq (index .Values "global" "platform" "hostType") "ip" }}
2021
- {{ include "ace.fullname" . }}-nats
2122
- {{ include "ace.fullname" . }}-nats.{{ .Release.Namespace }}.svc
2223
- {{ include "ace.fullname" . }}-nats.{{ .Release.Namespace }}.svc.cluster.local
2324
- {{ include "ace.fullname" . }}-s3proxy
2425
- {{ include "ace.fullname" . }}-s3proxy.{{ .Release.Namespace }}.svc
2526
- {{ include "ace.fullname" . }}-s3proxy.{{ .Release.Namespace }}.svc.cluster.local
27+
{{- end }}
2628
{{- if eq .Values.global.platform.hostType "domain" }}
2729
- "{{ .Values.global.platform.host }}"
2830
{{- if and .Values.nats.enabled .Values.nats.nats.externalAccess }}

charts/ace/templates/ingress/issuer.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ spec:
7575
parentRefs:
7676
- group: gateway.networking.k8s.io
7777
kind: Gateway
78-
name: {{ include "ace.fullname" . }}
79-
namespace: {{ .Release.Namespace }}
80-
sectionName: api
78+
name: {{ include "ace.fullname" . }}-gw-seed-backend
79+
namespace: {{ .Release.Namespace }}-gw
80+
sectionName: http
8181
{{- else }}
8282
ingress:
8383
ingressClassName: {{ index .Values "ingress-nginx" "controller" "ingressClassResource" "name" }}

charts/s3proxy/templates/httproute.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- group: ""
6060
kind: Secret
6161
name: {{ include "ace.fullname" . }}-cert
62-
hostname: {{ include "ace.fullname" . }}-s3proxy
62+
hostname: {{ index .Values.gateway.hosts 0 }}
6363
{{- end }}
6464

6565
---

0 commit comments

Comments
 (0)