From 660c74649e34e78c4e799e4b47a725184af9da13 Mon Sep 17 00:00:00 2001 From: Marcos Bjoerkelund Date: Thu, 8 Aug 2019 16:07:18 +0200 Subject: [PATCH] [stable/jasperreports] Fix deployment notes and typos in values.yaml (#16169) * Recreate PR Signed-off-by: Marcos Bjoerkelund * fix readme typo Signed-off-by: Marcos Bjoerkelund * fix error when using ingress Signed-off-by: Marcos Bjoerkelund --- stable/jasperreports/Chart.yaml | 2 +- stable/jasperreports/templates/NOTES.txt | 20 +++++++++++++------- stable/jasperreports/values.yaml | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/stable/jasperreports/Chart.yaml b/stable/jasperreports/Chart.yaml index b6e08ef9d3..2246eabc14 100644 --- a/stable/jasperreports/Chart.yaml +++ b/stable/jasperreports/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: jasperreports -version: 6.0.0 +version: 6.0.1 appVersion: 7.2.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, diff --git a/stable/jasperreports/templates/NOTES.txt b/stable/jasperreports/templates/NOTES.txt index b7861fe3b5..317e1036bc 100644 --- a/stable/jasperreports/templates/NOTES.txt +++ b/stable/jasperreports/templates/NOTES.txt @@ -1,9 +1,16 @@ {{- if or .Values.mariadb.enabled .Values.externalDatabase.host -}} -** Please be patient while the chart is being deployed ** -1. Get the JasperReports URL by running: +1. Get the JasperReports URL: -{{- if contains "NodePort" .Values.service.type }} +{{- if .Values.ingress.enabled }} + + You should be able to access your new JasperReports installation through + + {{- range .Values.ingress.hosts }} + {{ if .tls }}https{{ else }}http{{ end }}://{{ .name }}/jasperserver/ + {{- end }} + +{{- else if contains "NodePort" .Values.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "jasperreports.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") @@ -11,12 +18,11 @@ {{- else if contains "LoadBalancer" .Values.service.type }} -** Please ensure an external IP is associated to the {{ template "jasperreports.fullname" . }} service before proceeding ** -** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "jasperreports.fullname" . }} ** - - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "jasperreports.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "jasperreports.fullname" . }}' {{- $port:=.Values.service.port | toString }} + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "jasperreports.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "JasperReports URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/jasperserver/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/stable/jasperreports/values.yaml b/stable/jasperreports/values.yaml index 978f62affb..4d6f9bbda3 100644 --- a/stable/jasperreports/values.yaml +++ b/stable/jasperreports/values.yaml @@ -172,7 +172,7 @@ resources: cpu: 300m ## Configure the ingress resource that allows you to access the -## JasperPeports installation. Set up the URL +## JasperReports installation. Set up the URL ## ref: http://kubernetes.io/docs/user-guide/ingress/ ## ingress: @@ -194,7 +194,7 @@ ingress: ## The list of hostnames to be covered with this ingress record. ## Most likely this will be just one host, but in the event more hosts are needed, this is an array hosts: - - name: jasperrpeports.local + - name: jasperreports.local path: / ## Set this to true in order to enable TLS on the ingress record