updated notes, readme and deploy script

etc/README.md

@@ -29,7 +29,7 @@ helm install ingress-nginx ingress-nginx/ingress-nginx
 ````
 
 * Run `build-images.ps1` in the `scripts` directory.
-* Run `deploy-staging.ps1` in the `helm-chart` directory. It is deployed with the `eventhub` namespace.
+* Run `deploy-staging.ps1` in the `helm-chart` directory. It is deployed with the `eshop` namespace.
 * *You may wait ~30 seconds on first run for preparing the database*.
-* Browse https://eshoponabp-public-web and https://eshoponabp-authserver
+* Browse https://eshop-st-public-web for public and https://eshop-st-web for web application
 * Username: `admin`, password: `1q2w3E*`.

etc/k8s/deploy-staging.ps1

@@ -1,3 +1 @@
-param ($version='latest')
-
-helm upgrade --install es-st eshoponabp --namespace eshop --create-namespace --set global.eshoponabpImageVersion=$version
+helm upgrade --install es-st eshoponabp --namespace eshop --create-namespace

etc/k8s/eshoponabp/templates/NOTES.txt

@@ -1,5 +1,10 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
+1. Web (Back Office) angular application URL:{{- if .Values.web.config.selfUrl }} {{ .Values.web.config.selfUrl }} {{- end }}
+2. Public Web mvc application URL:{{- if index .Values "public-web" "config" "selfUrl" }} {{ index .Values "public-web" "config" "selfUrl" }} {{- end }}
+3. Authentication Server URL:{{- if .Values.authserver.config.selfUrl }} {{ .Values.authserver.config.selfUrl }}
+
+For RabbitMq Administration use:
+"kubectl port-forward services/{{ .Release.Name }}-rabbitmq 15672:15672 -n {{ .Release.Namespace }}"
+{{- else if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}

etc/k8s/eshoponabp/templates/_helpers.tpl

@@ -60,20 +60,3 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
-
-{{- define "eshoponabp.global.env" -}}
-- name: "DOTNET_ENVIRONMENT"
-  value: "{{ .Values.global.dotnetEnvironment }}"
-- name: "Redis__Configuration"
-  value: "{{ .Values.global.redisConfiguration }}"
-- name: "AuthServer__Authority"
-  value: "{{ .Values.global.internalAuthServerAuthority }}"
-- name: "AuthServer__RequireHttpsMetadata"
-  value: "{{ .Values.global.internalAuthServerRequireHttpsMetadata }}"
-- name: "StringEncryption__DefaultPassPhrase"
-  value: "{{ .Values.global.stringEncryptionDefaultPassPhrase }}"
-- name: "RabbitMQ__Connections__Default__HostName"
-  value: "{{ .Values.global.rabbitMqHostName }}"
-- name: "ElasticSearch__Url"
-  value: "{{ .Values.global.elasticSearchUrl }}"  
-{{- end }}