Minor fixes

rlex · Oct 6, 2021 · e0e6168 · e0e6168
1 parent 518d978
commit e0e6168
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/charts/kube-resource-report/Chart.yaml b/charts/kube-resource-report/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "21.10.0"
 description: Report Kubernetes cluster and pod resource requests vs usage and generate static HTML
 name: kube-resource-report
-version: 0.7.1
+version: 0.7.2
 home: https://codeberg.org/hjacobs/kube-resource-report
diff --git a/charts/kube-resource-report/templates/NOTES.txt b/charts/kube-resource-report/templates/NOTES.txt
@@ -2,20 +2,21 @@
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "kube-resource-report.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "kube-web-view.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 --namespace {{ .Release.Namespace }} svc -w {{ include "kube-resource-report.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kube-resource-report.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "kube-web-view.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kube-web-view.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   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 "kube-resource-report.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kube-web-view.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.container.port }}
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
 {{- end }}
diff --git a/charts/kube-resource-report/values.yaml b/charts/kube-resource-report/values.yaml
@@ -55,14 +55,13 @@ pricing:
     dc-1,worker,500.000
 
 service:
-  type: ClusterIP
-  port: 8080
-  portName: http
-
+    type: ClusterIP
+    port: 80
+    portName: http
 container:
-  port: 8080
-  portName: http
-  portProtocol: TCP
+    port: 8080
+    portName: http
+    portProtocol: TCP
 
 ingress:
   enabled: false