mirror of
https://github.com/bitnami/charts.git
synced 2026-03-06 15:10:15 +08:00
8d539d5d21
* [bitnami/apache] Make `ingress.tls` into a bool Its contents were not parsed anyway since chart version [v9.0.0](https://github.com/bitnami/charts/pull/7491/), so this change has no functional effect. Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Cleanup messy ingress.tls logic I have convinced myself that this change has no functional effect. * `ingress.tls` always had to be set, so that logic is the same. * It is now possible to set `ingress.tls` without setting `ingress.certManager` or `ingress.selfSigned`. What's the harm in that? Perhaps someone would like to provide a TLS secret manually... Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Remove unused value ingress.hosts Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Bump chart version Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Remove ingress.certManager This change removes the long deprecated annotation for cert-manager from the Ingress resource. NOTE: Technically, this is a breaking change. If someone is using the `ingress.certManager` value, they will lose the annotation. I imagine there are few cases where the annotation has any effect, but there's always someone out there running some really odd configuration... It's of course still possible to have the annotation, it just has to be included in `ingress.annotations`, along with the rest of the annotations. Since the value is no longer in use anywhere, we also remove it from values.yaml. Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Bump chart version Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * [bitnami/apache] Revert breaking change by checking ingress.selfSigned Before this change, I had accidentally missed the case where the user has `--set 'ingress.enabled=true,ingress.selfSigned=true'`, which inadvertently introduced a breaking change. This change makes sure this case is covered as before the PR was merged. Signed-off-by: Andreas Lindhé <andreas@lindhe.io> * Full standardization of ingress Signed-off-by: Andrés Bono <andresbono@vmware.com> --------- Signed-off-by: Andreas Lindhé <andreas@lindhe.io> Signed-off-by: Andrés Bono <andresbono@vmware.com> Co-authored-by: Andrés Bono <andresbono@vmware.com>
46 lines
2.6 KiB
Plaintext
46 lines
2.6 KiB
Plaintext
CHART NAME: {{ .Chart.Name }}
|
|
CHART VERSION: {{ .Chart.Version }}
|
|
APP VERSION: {{ .Chart.AppVersion }}
|
|
|
|
** Please be patient while the chart is being deployed **
|
|
|
|
1. Get the Apache URL by running:
|
|
|
|
{{- if .Values.ingress.enabled }}
|
|
|
|
You should be able to access your new Apache installation through:
|
|
|
|
{{- if .Values.ingress.hostname }}
|
|
- http://{{ .Values.ingress.hostname }}
|
|
{{- end }}
|
|
|
|
{{- else if contains "NodePort" .Values.service.type }}
|
|
|
|
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.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 }}
|
|
|
|
** Please ensure an external IP is associated to the {{ template "common.names.fullname" . }} service before proceeding **
|
|
** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }} **
|
|
|
|
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
|
|
{{- $port:=(coalesce .Values.service.ports.http .Values.service.port) | toString }}
|
|
echo URL : http://$SERVICE_IP{{- if ne $port "80" }}:{{ coalesce .Values.service.ports.http .Values.service.port }}{{ end }}/
|
|
{{- else if contains "ClusterIP" .Values.service.type }}
|
|
kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:{{ coalesce .Values.service.ports.http .Values.service.port}}
|
|
echo URL : http://127.0.0.1:8080/
|
|
{{- end }}
|
|
|
|
{{/* WARNINGS */}}
|
|
{{- if not (include "apache.useHtdocs" .) }}
|
|
WARNING: You did not provide a custom web application. Apache will be deployed with a default page. Check the README section "Deploying your custom web application" in https://github.com/bitnami/charts/blob/main/bitnami/apache/README.md#deploying-a-custom-web-application.
|
|
{{- end }}
|
|
{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
|
|
WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
|
|
+info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
|
|
{{- end }}
|
|
|
|
{{ include "apache.validateValues" . }}
|