Merge branch 'bug/OXUIB-2277' into 'main'

OXUIB-2277: Remove ingress and service account templates from helm chart

See merge request frontend/user-guide!11

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

helm/core-user-guide/templates/NOTES.txt

 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

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 }}

helm/core-user-guide/templates/_ingress.tpl

-{{- define "core-user-guide.ingressPathMappings" -}}
-paths:
-  - path: /help/
-{{- end -}}

helm/core-user-guide/templates/ingress.yaml

-{{- if .Values.ingress.enabled -}}
-{{ include "ox-common.ingress.defaultIngress" (dict "ingress" .Values.ingress "context" . "global" $) }}
-{{- end }}

helm/core-user-guide/templates/serviceaccount.yaml

-{{- 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 }}

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.