Fix for helm 3 and k8s 1.16

deploy/k8s/helm/apigwmm/templates/deployment.yaml

@@ -1,7 +1,7 @@
 {{- $name := include "apigwmm.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwmm.fullname" . }}

deploy/k8s/helm/apigwms/templates/deployment.yaml

@@ -1,7 +1,7 @@
 {{- $name := include "apigwms.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwms.fullname" . }}

deploy/k8s/helm/apigwwm/templates/deployment.yaml

@@ -1,7 +1,7 @@
 {{- $name := include "apigwwm.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwwm.fullname" . }}

deploy/k8s/helm/apigwws/templates/deployment.yaml

@@ -1,7 +1,7 @@
 {{- $name := include "apigwws.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
 {{- $envoycfgname := printf "%s-%s" "envoy" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "apigwws.fullname" . }}

deploy/k8s/helm/basket-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "basket-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "basket-api.fullname" . }}

deploy/k8s/helm/basket-data/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "basket-data.fullname" . }}

deploy/k8s/helm/catalog-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "catalog-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "catalog-api.fullname" . }}

deploy/k8s/helm/deploy-all.ps1

@@ -33,7 +33,7 @@ function Install-Chart  {
     }
     
     if ($chart -ne "eshop-common" -or $customRegistry)  {       # eshop-common is ignored when no secret must be deployed        
-        $command = "install $options --name=$appName-$chart $chart"
+        $command = "install $appName-$chart $options $chart"
         Write-Host "Helm Command: helm $command" -ForegroundColor Gray
         Invoke-Expression 'cmd /c "helm $command"'
     }
@@ -95,10 +95,16 @@ if ($useLocalk8s -and $sslEnabled) {
 }
 
 if ($clean) {    
+    $listOfReleases=$(helm ls --filter eshop -q)    
+    if ([string]::IsNullOrEmpty($listOfReleases)) {
+        Write-Host "No previous releases found!" -ForegroundColor Green
+	}else{
+        Write-Host "Previous releases found" -ForegroundColor Green
         Write-Host "Cleaning previous helm releases..." -ForegroundColor Green
-    helm delete --purge $(helm ls -q eshop) 
+        helm uninstall $listOfReleases
         Write-Host "Previous releases deleted" -ForegroundColor Green
 	}        
+}
 
 $useCustomRegistry=$false
 
@@ -119,7 +125,7 @@ $gateways = ("apigwmm", "apigwms", "apigwwm", "apigwws")
 if ($deployInfrastructure) {
     foreach ($infra in $infras) {
         Write-Host "Installing infrastructure: $infra" -ForegroundColor Green
-        helm install --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" --name="$appName-$infra" $infra     
+        helm install "$appName-$infra" --values app.yaml --values inf.yaml --values $ingressValuesFile --set app.name=$appName --set inf.k8s.dns=$dns --set "ingress.hosts={$dns}" $infra     
     }
 }
 else {

deploy/k8s/helm/deploy-all.sh

@@ -201,7 +201,7 @@ if [[ $clean ]]; then
   if [[ -z $(helm ls -q --namespace $namespace) ]]; then
     echo "No previous releases found"
   else
-    helm delete --purge $(helm ls -q --namespace $namespace)
+    helm uninstall $(helm ls -q --namespace $namespace)
     echo "Previous releases deleted"
     waitsecs=10; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
   fi
@@ -215,7 +215,7 @@ if [[ !$skip_infrastructure ]]; then
   for infra in "${infras[@]}"
   do
     echo "Installing infrastructure: $infra"
-    helm install --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --name="$app_name-$infra" $infra     
+    helm install "$app_name-$infra" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns $infra     
   done  
 fi
 
@@ -223,9 +223,9 @@ for chart in "${charts[@]}"
 do
     echo "Installing: $chart"
     if [[ $use_custom_registry ]]; then 
-      helm install --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart 
+      helm install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --set inf.registry.server=$container_registry --set inf.registry.login=$docker_username --set inf.registry.pwd=$docker_password --set inf.registry.secretName=eshop-docker-scret --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
     elif [[ $chart != "eshop-common" ]]; then  # eshop-common is ignored when no secret must be deployed
-      helm install --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always --name="$app_name-$chart" $chart 
+      helm install "$app_name-$chart" --namespace $namespace --set "ingress.hosts={$dns}" --values app.yaml --values inf.yaml --values $ingress_values_file --set app.name=$app_name --set inf.k8s.dns=$dns --set image.tag=$image_tag --set image.pullPolicy=Always $chart 
     fi
 done
 

deploy/k8s/helm/identity-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "identity-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "identity-api.fullname" . }}

deploy/k8s/helm/keystore-data/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "keystore-data.fullname" . }}

deploy/k8s/helm/locations-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "locations-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "locations-api.fullname" . }}

deploy/k8s/helm/marketing-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "marketing-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "marketing-api.fullname" . }}

deploy/k8s/helm/mobileshoppingagg/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "mobileshoppingagg.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "mobileshoppingagg.fullname" . }}

deploy/k8s/helm/nosql-data/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "nosql-data.fullname" . }}

deploy/k8s/helm/ordering-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "ordering-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-api.fullname" . }}

deploy/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml

@@ -1,7 +1,7 @@
 {{- $name := include "ordering-backgroundtasks.fullname" . -}}
 {{- $cfgname :=  printf "cfg-%s" $name | trunc 63  }}
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-backgroundtasks.fullname" . }}

deploy/k8s/helm/ordering-signalrhub/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "ordering-signalrhub.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ordering-signalrhub.fullname" . }}

deploy/k8s/helm/payment-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "payment-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "payment-api.fullname" . }}

deploy/k8s/helm/rabbitmq/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "rabbitmq.fullname" . }}

deploy/k8s/helm/sql-data/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "sql-data.fullname" . }}

deploy/k8s/helm/webhooks-api/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webhooks-api.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webhooks-api.fullname" . }}

deploy/k8s/helm/webhooks-web/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webhooks-web.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webhooks-web.fullname" . }}

deploy/k8s/helm/webmvc/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webmvc.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webmvc.fullname" . }}

deploy/k8s/helm/webshoppingagg/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webshoppingagg.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webshoppingagg.fullname" . }}

deploy/k8s/helm/webspa/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webspa.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webspa.fullname" . }}

deploy/k8s/helm/webstatus/templates/deployment.yaml

@@ -1,6 +1,6 @@
 {{- $name := include "webstatus.fullname" . -}}
 {{- $cfgname := printf "%s-%s" "cfg" $name -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "webstatus.fullname" . }}

deploy/k8s/nginx-ingress/mandatory.yaml

@@ -163,7 +163,7 @@ subjects:
 
 ---
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-ingress-controller