diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml index b67de0c31..3fad57b6e 100644 --- a/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/alerts/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/alerts/values.yaml b/scripts/helmcharts/openreplay/charts/alerts/values.yaml index ca76602c1..584137a69 100644 --- a/scripts/helmcharts/openreplay/charts/alerts/values.yaml +++ b/scripts/helmcharts/openreplay/charts/alerts/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml index 9b847cf11..485de679a 100644 --- a/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/assets/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/assets/values.yaml b/scripts/helmcharts/openreplay/charts/assets/values.yaml index f750695b7..5c40f11af 100644 --- a/scripts/helmcharts/openreplay/charts/assets/values.yaml +++ b/scripts/helmcharts/openreplay/charts/assets/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml index b4956e41d..274da0fd6 100644 --- a/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/canvas-handler/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml b/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml index 152287787..5552c3358 100644 --- a/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml +++ b/scripts/helmcharts/openreplay/charts/canvas-handler/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/canvas-maker/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/canvas-maker/templates/ingress.yaml index d5bc81c60..43369722e 100644 --- a/scripts/helmcharts/openreplay/charts/canvas-maker/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/canvas-maker/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/canvas-maker/values.yaml b/scripts/helmcharts/openreplay/charts/canvas-maker/values.yaml index a4520b230..99faaedc1 100644 --- a/scripts/helmcharts/openreplay/charts/canvas-maker/values.yaml +++ b/scripts/helmcharts/openreplay/charts/canvas-maker/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml index c925dc772..1ca2c0d6f 100644 --- a/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/db/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/db/values.yaml b/scripts/helmcharts/openreplay/charts/db/values.yaml index fe34eecc9..0824a70c7 100644 --- a/scripts/helmcharts/openreplay/charts/db/values.yaml +++ b/scripts/helmcharts/openreplay/charts/db/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml index 37cd134e7..8db45598f 100644 --- a/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/ender/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/ender/values.yaml b/scripts/helmcharts/openreplay/charts/ender/values.yaml index 7e51481a8..d48a18658 100644 --- a/scripts/helmcharts/openreplay/charts/ender/values.yaml +++ b/scripts/helmcharts/openreplay/charts/ender/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml index 050dda911..2431314b8 100644 --- a/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/heuristics/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/heuristics/values.yaml b/scripts/helmcharts/openreplay/charts/heuristics/values.yaml index d91bd936d..f1f90000f 100644 --- a/scripts/helmcharts/openreplay/charts/heuristics/values.yaml +++ b/scripts/helmcharts/openreplay/charts/heuristics/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/imagestorage/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/imagestorage/templates/ingress.yaml index dac53a91d..94a3c9ae7 100644 --- a/scripts/helmcharts/openreplay/charts/imagestorage/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/imagestorage/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/imagestorage/values.yaml b/scripts/helmcharts/openreplay/charts/imagestorage/values.yaml index 332409223..c007e439c 100644 --- a/scripts/helmcharts/openreplay/charts/imagestorage/values.yaml +++ b/scripts/helmcharts/openreplay/charts/imagestorage/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml index 379d77834..057d36ac1 100644 --- a/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/integrations/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/integrations/values.yaml b/scripts/helmcharts/openreplay/charts/integrations/values.yaml index dcc862a2c..c354527ab 100644 --- a/scripts/helmcharts/openreplay/charts/integrations/values.yaml +++ b/scripts/helmcharts/openreplay/charts/integrations/values.yaml @@ -64,7 +64,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml index 4834fed1a..641a401e3 100644 --- a/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/sink/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/sink/values.yaml b/scripts/helmcharts/openreplay/charts/sink/values.yaml index c7526ffbf..48ace36eb 100644 --- a/scripts/helmcharts/openreplay/charts/sink/values.yaml +++ b/scripts/helmcharts/openreplay/charts/sink/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml index 687c81061..741aedfe8 100644 --- a/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/storage/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/storage/values.yaml b/scripts/helmcharts/openreplay/charts/storage/values.yaml index 471c41dcb..970ebb54d 100644 --- a/scripts/helmcharts/openreplay/charts/storage/values.yaml +++ b/scripts/helmcharts/openreplay/charts/storage/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/scripts/helmcharts/openreplay/charts/videostorage/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/videostorage/templates/ingress.yaml index 0568a9202..e2214429e 100644 --- a/scripts/helmcharts/openreplay/charts/videostorage/templates/ingress.yaml +++ b/scripts/helmcharts/openreplay/charts/videostorage/templates/ingress.yaml @@ -24,9 +24,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} + ingressClassName: "{{ tpl .Values.ingress.className . }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/scripts/helmcharts/openreplay/charts/videostorage/values.yaml b/scripts/helmcharts/openreplay/charts/videostorage/values.yaml index c49f39f01..49ed11aa4 100644 --- a/scripts/helmcharts/openreplay/charts/videostorage/values.yaml +++ b/scripts/helmcharts/openreplay/charts/videostorage/values.yaml @@ -62,7 +62,7 @@ serviceMonitor: ingress: enabled: false - className: "" + className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true"