From dc0e17fde09871bfed9ea4f85e73c1824319a3ff Mon Sep 17 00:00:00 2001 From: Vibhor Dabas Date: Mon, 24 Jul 2023 19:38:40 +0530 Subject: [PATCH 1/2] fix: deploy ingress in the tenant chart and not via mission control chart --- chart/templates/ingress.yaml | 24 ++++++++++++++++++++++++ chart/values.yaml | 17 +++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 chart/templates/ingress.yaml diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml new file mode 100644 index 00000000..e2a990ca --- /dev/null +++ b/chart/templates/ingress.yaml @@ -0,0 +1,24 @@ +{{- if .Values.hostnameOverride -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: incident-manager-ui-{{ .Release.Name }} + namespace: {{ .Release.Namespace }} + annotations: + kubernetes.io/tls-acme: "true" +spec: + tls: + - hosts: {{ .Values.hostnameOverride | quote }} + secretName: mission-control-tls-{{ .Release.Name }} + rules: + - host: {{ .Values.hostnameOverride | quote }} + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: incident-manager-ui-x-default-x-{{ .Release.Name }} + port: + number: 80 +{{- end }} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index f0fac777..61cedbdb 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,6 +1,6 @@ nameOverride: "" fullnameOverride: "" - +hostnameOverride: "" missionControlChartVersion: ">=0.0.0" missionControl: canary-checker: @@ -10,13 +10,14 @@ missionControl: flanksource-ui: oryKratosURL: https://mission-control.local/api/.ory ingress: - annotations: - kubernetes.io/tls-acme: "true" - host: mission-control.local - tls: - - hosts: - - mission-control.demo.local - secretName: mission-control-tls + enabled: false + # annotations: + # kubernetes.io/tls-acme: "true" + # host: mission-control.local + # tls: + # - hosts: + # - mission-control.demo.local + # secretName: mission-control-tls # See https://github.com/loft-sh/vcluster/blob/main/charts/k3s/values.yaml vcluster: From 3d94315842d1b14f68a388f08d16627cbefd9440 Mon Sep 17 00:00:00 2001 From: Vibhor Dabas Date: Mon, 24 Jul 2023 20:52:10 +0530 Subject: [PATCH 2/2] fix: change hostnameOverride to domain --- chart/templates/ingress.yaml | 8 +++----- chart/values.yaml | 9 +-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index e2a990ca..24f41565 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -1,4 +1,3 @@ -{{- if .Values.hostnameOverride -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -8,10 +7,10 @@ metadata: kubernetes.io/tls-acme: "true" spec: tls: - - hosts: {{ .Values.hostnameOverride | quote }} + - hosts: {{ .Values.domain | quote }} secretName: mission-control-tls-{{ .Release.Name }} rules: - - host: {{ .Values.hostnameOverride | quote }} + - host: {{ .Values.domain | quote }} http: paths: - path: / @@ -20,5 +19,4 @@ spec: service: name: incident-manager-ui-x-default-x-{{ .Release.Name }} port: - number: 80 -{{- end }} \ No newline at end of file + number: 80 \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 61cedbdb..c23a8e87 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,6 +1,6 @@ nameOverride: "" fullnameOverride: "" -hostnameOverride: "" +domain: "" missionControlChartVersion: ">=0.0.0" missionControl: canary-checker: @@ -11,13 +11,6 @@ missionControl: oryKratosURL: https://mission-control.local/api/.ory ingress: enabled: false - # annotations: - # kubernetes.io/tls-acme: "true" - # host: mission-control.local - # tls: - # - hosts: - # - mission-control.demo.local - # secretName: mission-control-tls # See https://github.com/loft-sh/vcluster/blob/main/charts/k3s/values.yaml vcluster: