diff --git a/docs/installation/kubernetes.md b/docs/installation/kubernetes.md index 169be8fef..b6591d871 100644 --- a/docs/installation/kubernetes.md +++ b/docs/installation/kubernetes.md @@ -33,7 +33,6 @@ config: # host: s3-host ingress: - enabled: false annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index 99ea21d12..2af4fed6f 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,19 +1,5 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} +1. Access passbook using the following URL: {{- range .Values.ingress.hosts }} http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} {{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "passbook.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 svc -w {{ include "passbook.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "passbook.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - 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 "passbook.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:8000 -{{- end }} +2. Login to passbook using the user "pbadmin" and the password "pbadmin". diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml index 2f6aefc2e..eee9f3d04 100644 --- a/helm/templates/ingress.yaml +++ b/helm/templates/ingress.yaml @@ -1,4 +1,3 @@ -{{- if .Values.ingress.enabled -}} {{- $fullName := include "passbook.fullname" . -}} apiVersion: extensions/v1beta1 kind: Ingress @@ -46,4 +45,3 @@ spec: serviceName: {{ $fullName }}-static servicePort: http {{- end }} -{{- end }} diff --git a/helm/values.yaml b/helm/values.yaml index e6895d508..87bb5b93b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -26,7 +26,6 @@ config: # host: s3-host ingress: - enabled: false annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true"