Revert "Revert "Feature 11010: Use of upstream helm charts for Prometheus and Grafana...

[osm/devops.git] / installers / helm / osm / templates / NOTES.txt

diff --git a/installers/helm/osm/templates/NOTES.txt b/installers/helm/osm/templates/NOTES.txt
index eef0be8..45e1821 100644 (file)
--- a/installers/helm/osm/templates/NOTES.txt
+++ b/installers/helm/osm/templates/NOTES.txt
@@ -28,7 +28,6 @@
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} nbi --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.nbi.service.port }}
 {{- end }}
-<<<<<<< HEAD
 {{- else }}
   export OSM_GUI_URL=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.rules[0].host}" ingress ngui-ingress)
   echo "OSM UI: $OSM_GUI_URL"
@@ -37,5 +36,3 @@
 {{- end }}
 2. Get Grafana credentials for admin user using below command.
   kubectl -n {{ .Release.Namespace }}  get secret grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
-=======
->>>>>>> e34e722 (Revert "Feature 11010: Use of upstream helm charts for Prometheus and Grafana in OSM installation.")