[extras] Switch to better metrics-server helm chart; remove dep on sk…

…affold for Google Microservice demo.

extras/fun_with_prometheus_grafana_and_k8s.sh

@@ -2,12 +2,17 @@
 
 helm repo add bitnami https://charts.bitnami.com/bitnami
 helm repo update
-helm install --atomic my-metrics-server bitnami/metrics-server --version 5.9.2
-helm upgrade --atomic my-metrics-server bitnami/metrics-server --set apiService.create=true
+#helm install --atomic my-metrics-server bitnami/metrics-server --version 5.9.2
+#helm upgrade --atomic my-metrics-server bitnami/metrics-server --set apiService.create=true
+helm repo add metrics-server https://kubernetes-sigs.github.io/metrics-server/
+helm repo update
+helm install my-metrics-server metrics-server/metrics-server --version 3.6.0 --set apiService.create=true --set args={kubelet-insecure-tls} -n monitor
 helm install --atomic my-kube-state-metrics bitnami/kube-state-metrics --version 2.1.1
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 helm repo update
-helm install --atomic my-prometheus-stack prometheus-community/kube-prometheus-stack --create-namespace -n monitor
+helm install --atomic my-prometheus-stack prometheus-community/kube-prometheus-stack --create-namespace -n monitor \
+  --set prometheus.prometheusSpec.podMonitorSelectorNilUsesHelmValues=false \
+  --set prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues=false
 sleep 30
 kubectl port-forward -n monitor prometheus-my-prometheus-stack-kube-p-prometheus-0 9090 --address 0.0.0.0 >> /dev/null &
 echo "Prometheus UI: http://kind.test:9090/"

extras/google-demo-microservice.sh

@@ -7,5 +7,6 @@ cd microservices-demo
 kubectl create namespace demo
 kubectl -n demo apply -f ./release/kubernetes-manifests.yaml 
 kubectl wait --for=condition=available deployment/frontend -n demo
-kubectl port-forward deployment/frontend 9292:8080
-echo "Browse to http://kind.test:8080"
+#kubectl port-forward deployment/frontend 9292:8080
+kubectl -n demo port-forward svc/frontend 8081:80 --address 0.0.0.0 >> /dev/null &
+echo "Browse to http://kind.test:8081"