From 96d1366bad661d8f9967dcd38458002581655277 Mon Sep 17 00:00:00 2001
From: Michael Koch <michael.koch@open-xchange.com>
Date: Fri, 24 Nov 2023 14:29:06 +0100
Subject: [PATCH] Improved ingress configuration
---
helm/core-ui-middleware/Chart.yaml | 2 +-
helm/core-ui-middleware/templates/NOTES.txt | 22 -------------------
.../core-ui-middleware/templates/_ingress.tpl | 4 ----
.../core-ui-middleware/templates/ingress.yaml | 3 ---
helm/core-ui-middleware/values.yaml | 14 ------------
5 files changed, 1 insertion(+), 44 deletions(-)
delete mode 100644 helm/core-ui-middleware/templates/NOTES.txt
delete mode 100644 helm/core-ui-middleware/templates/_ingress.tpl
delete mode 100644 helm/core-ui-middleware/templates/ingress.yaml
diff --git a/helm/core-ui-middleware/Chart.yaml b/helm/core-ui-middleware/Chart.yaml
index c97bd48..4303346 100644
--- a/helm/core-ui-middleware/Chart.yaml
+++ b/helm/core-ui-middleware/Chart.yaml
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.1
+version: 3.0.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/core-ui-middleware/templates/NOTES.txt b/helm/core-ui-middleware/templates/NOTES.txt
deleted file mode 100644
index f08ecd0..0000000
--- a/helm/core-ui-middleware/templates/NOTES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-ui-middleware.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "core-ui-middleware.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "core-ui-middleware.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
- echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "core-ui-middleware.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
diff --git a/helm/core-ui-middleware/templates/_ingress.tpl b/helm/core-ui-middleware/templates/_ingress.tpl
deleted file mode 100644
index 2a8e9a0..0000000
--- a/helm/core-ui-middleware/templates/_ingress.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{- define "core-ui-middleware.ingressPathMappings" -}}
-paths:
- - path: "{{ include "ox-common.appsuite.appRoot" . }}/"
-{{- end -}}
diff --git a/helm/core-ui-middleware/templates/ingress.yaml b/helm/core-ui-middleware/templates/ingress.yaml
deleted file mode 100644
index 027e9ac..0000000
--- a/helm/core-ui-middleware/templates/ingress.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{ include "ox-common.ingress.defaultIngress" (dict "ingress" .Values.ingress "context" . "global" $) }}
-{{- end }}
diff --git a/helm/core-ui-middleware/values.yaml b/helm/core-ui-middleware/values.yaml
index 8f4966e..0943871 100644
--- a/helm/core-ui-middleware/values.yaml
+++ b/helm/core-ui-middleware/values.yaml
@@ -54,20 +54,6 @@ service:
type: ClusterIP
port: 80
-ingress:
- enabled: false
- pathMappings: "core-ui-middleware.ingressPathMappings"
- annotations: {}
- # kubernetes.io/ingress.class: nginx
- # kubernetes.io/tls-acme: "true"
- hosts:
- - host: chart-example.local
-
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
-
resources:
# We recommend to always specify resources after actually measuring the values under
# production-like circumstances.
--
GitLab