diff --git a/helm/core-user-guide/Chart.yaml b/helm/core-user-guide/Chart.yaml index 6368c5cdd4a6d2d2fe7d2243337358e3833deba4..fbfce0a612be9e224e5bf4280a22cd13ad37fe42 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 49ad89716cafbbd26502a96bc4a3f1e2e50efee0..7b432728f8bdb0abaae91d3b6555982d8a651626 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 5616862550a1dbe2a27ea549311de03244cac8aa..a6a8ab770530f2aa13f5b23500b6d15bbf3b62ef 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 b5a850f33eee6e9dbb1ae052510111db8d69811d..0000000000000000000000000000000000000000 --- 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 027e9ac3fa918c72d4b0c93414d7cee9e1529e68..0000000000000000000000000000000000000000 --- 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 e10a58d2b65dc407e51e2980a146e85496924d76..0000000000000000000000000000000000000000 --- 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 52cef1d002b80f651df313b399c1e47368fd6a7b..da88354270d70f5ca4c425f90bdce88e6cc69069 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.