From 2fb591cfb72d1a08c70a32faa69e1af88d139677 Mon Sep 17 00:00:00 2001 From: jimmy-ungerman Date: Thu, 24 Oct 2024 12:55:25 -0600 Subject: [PATCH 1/4] ingressClass support --- kasm-single-zone/Chart.yaml | 2 +- kasm-single-zone/templates/ingress.yaml | 3 +++ kasm-single-zone/values.schema.json | 6 ++++++ kasm-single-zone/values.yaml | 7 ++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kasm-single-zone/Chart.yaml b/kasm-single-zone/Chart.yaml index ac28f41..2f0911e 100644 --- a/kasm-single-zone/Chart.yaml +++ b/kasm-single-zone/Chart.yaml @@ -32,4 +32,4 @@ keywords: maintainers: - name: Kasm Technologies, Inc. url: https://github.com/kasmtech/kasm-helm -version: 1.16.0-develop +version: 1.16.1-develop diff --git a/kasm-single-zone/templates/ingress.yaml b/kasm-single-zone/templates/ingress.yaml index 20ee154..c38f4c7 100644 --- a/kasm-single-zone/templates/ingress.yaml +++ b/kasm-single-zone/templates/ingress.yaml @@ -7,6 +7,9 @@ metadata: app.kubernetes.io/name: {{ .Values.kasmApp.name }}-ingress {{- include "kasm.defaultLabels" . | indent 4 }} spec: + {{- with .Values.global.ingressClassName }} + ingressClassName: {{ . }} + {{- end }} tls: - hosts: - {{ .Values.global.hostname | quote }} diff --git a/kasm-single-zone/values.schema.json b/kasm-single-zone/values.schema.json index 8df9edf..0e6e0f3 100644 --- a/kasm-single-zone/values.schema.json +++ b/kasm-single-zone/values.schema.json @@ -22,6 +22,12 @@ "title": "hostname", "type": "string" }, + "ingressClassName": { + "default": "", + "description": "##@param global.ingressClass Global ingress class to use for ingress object\n##", + "title": "ingressClassName", + "type": "string" + }, "image": { "additionalProperties": false, "properties": { diff --git a/kasm-single-zone/values.yaml b/kasm-single-zone/values.yaml index daee239..0c074b4 100644 --- a/kasm-single-zone/values.yaml +++ b/kasm-single-zone/values.yaml @@ -29,7 +29,12 @@ global: ## @param global.hostname Global hostname to use for TLS Certificates and ingress URL ## - hostname: "" + hostname: "kasm.uds.dev" + + ## @param global.ingressClass Global ingress class to use for ingress object + ## + ingressClassName: "nginx" + ## @param global.altHostnames Global list of alternate hostnames to use for TLS Certificates ## altHostnames: [] From 6d26e283116e07468264e879714fe364fe0e7b9b Mon Sep 17 00:00:00 2001 From: jimmy-ungerman Date: Thu, 24 Oct 2024 12:55:43 -0600 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f66b653..42c12d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ # Changelog +## [1.16.1-develop] - 2024-10-24 +- Add support for a defined ingress class + ## [0.0.1] - 2024-07-19 From 98f502fa6147f09bccffb897e1cded2cbbe34988 Mon Sep 17 00:00:00 2001 From: jimmy-ungerman Date: Thu, 24 Oct 2024 13:17:23 -0600 Subject: [PATCH 3/4] remove test hostname --- kasm-single-zone/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kasm-single-zone/values.yaml b/kasm-single-zone/values.yaml index 0c074b4..96c1a37 100644 --- a/kasm-single-zone/values.yaml +++ b/kasm-single-zone/values.yaml @@ -29,7 +29,7 @@ global: ## @param global.hostname Global hostname to use for TLS Certificates and ingress URL ## - hostname: "kasm.uds.dev" + hostname: "" ## @param global.ingressClass Global ingress class to use for ingress object ## From 08c43acded318d12fab8e1ac2fbe39952e80ca52 Mon Sep 17 00:00:00 2001 From: jimmy-ungerman Date: Thu, 24 Oct 2024 13:18:03 -0600 Subject: [PATCH 4/4] set default ingress class as empty value --- kasm-single-zone/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kasm-single-zone/values.yaml b/kasm-single-zone/values.yaml index 96c1a37..5ae253f 100644 --- a/kasm-single-zone/values.yaml +++ b/kasm-single-zone/values.yaml @@ -33,7 +33,7 @@ global: ## @param global.ingressClass Global ingress class to use for ingress object ## - ingressClassName: "nginx" + ingressClassName: "" ## @param global.altHostnames Global list of alternate hostnames to use for TLS Certificates ##