From bfe3424f741d14d94d0a7d041ab2243f0112c5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Scha=CC=88fer?= <maik.schaefer@open-xchange.com>
Date: Thu, 23 Mar 2023 12:29:12 +0100
Subject: [PATCH] OXUIB-2277: Remove ingress and service account templates from
helm chart
---
helm/core-user-guide/Chart.yaml | 2 +-
helm/core-user-guide/templates/NOTES.txt | 8 +------
helm/core-user-guide/templates/_helpers.tpl | 11 ---------
helm/core-user-guide/templates/_ingress.tpl | 4 ----
helm/core-user-guide/templates/ingress.yaml | 3 ---
.../templates/serviceaccount.yaml | 12 ----------
helm/core-user-guide/values.yaml | 23 -------------------
7 files changed, 2 insertions(+), 61 deletions(-)
delete mode 100644 helm/core-user-guide/templates/_ingress.tpl
delete mode 100644 helm/core-user-guide/templates/ingress.yaml
delete mode 100644 helm/core-user-guide/templates/serviceaccount.yaml
diff --git a/helm/core-user-guide/Chart.yaml b/helm/core-user-guide/Chart.yaml
index 6368c5cdd..fbfce0a61 100644
--- a/helm/core-user-guide/Chart.yaml
+++ b/helm/core-user-guide/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: 2.13.0
+version: 2.13.1
# 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-user-guide/templates/NOTES.txt b/helm/core-user-guide/templates/NOTES.txt
index 49ad89716..7b432728f 100644
--- a/helm/core-user-guide/templates/NOTES.txt
+++ b/helm/core-user-guide/templates/NOTES.txt
@@ -1,11 +1,5 @@
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 }}
+{{if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-user-guide.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
diff --git a/helm/core-user-guide/templates/_helpers.tpl b/helm/core-user-guide/templates/_helpers.tpl
index 561686255..a6a8ab770 100644
--- a/helm/core-user-guide/templates/_helpers.tpl
+++ b/helm/core-user-guide/templates/_helpers.tpl
@@ -49,14 +49,3 @@ Selector labels
app.kubernetes.io/name: {{ include "core-user-guide.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "core-user-guide.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "core-user-guide.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/helm/core-user-guide/templates/_ingress.tpl b/helm/core-user-guide/templates/_ingress.tpl
deleted file mode 100644
index b5a850f33..000000000
--- a/helm/core-user-guide/templates/_ingress.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{- define "core-user-guide.ingressPathMappings" -}}
-paths:
- - path: /help/
-{{- end -}}
diff --git a/helm/core-user-guide/templates/ingress.yaml b/helm/core-user-guide/templates/ingress.yaml
deleted file mode 100644
index 027e9ac3f..000000000
--- a/helm/core-user-guide/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-user-guide/templates/serviceaccount.yaml b/helm/core-user-guide/templates/serviceaccount.yaml
deleted file mode 100644
index e10a58d2b..000000000
--- a/helm/core-user-guide/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: {{ include "core-user-guide.serviceAccountName" . }}
- labels:
- {{- include "core-user-guide.labels" . | nindent 4 }}
- {{- with .Values.serviceAccount.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
- {{- end }}
-{{- end }}
diff --git a/helm/core-user-guide/values.yaml b/helm/core-user-guide/values.yaml
index 52cef1d00..da8835427 100644
--- a/helm/core-user-guide/values.yaml
+++ b/helm/core-user-guide/values.yaml
@@ -16,15 +16,6 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
-serviceAccount:
- # Specifies whether a service account should be created
- create: true
- # Annotations to add to the service account
- annotations: {}
- # The name of the service account to use.
- # If not set and create is true, a name is generated using the fullname template
- name: ""
-
podAnnotations: {}
podSecurityContext:
@@ -46,20 +37,6 @@ service:
type: ClusterIP
port: 80
-ingress:
- enabled: false
- pathMappings: "core-user-guide.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