diff --git a/deploy/kubernetes/complete-demo.yaml b/deploy/kubernetes/complete-demo.yaml index 457f09fa..02fbc7b3 100644 --- a/deploy/kubernetes/complete-demo.yaml +++ b/deploy/kubernetes/complete-demo.yaml @@ -53,7 +53,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -112,7 +112,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -183,7 +183,7 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -231,7 +231,7 @@ spec: - name: mysql containerPort: 3306 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -298,7 +298,7 @@ spec: initialDelaySeconds: 30 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -367,7 +367,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -426,7 +426,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -494,7 +494,7 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -546,7 +546,7 @@ spec: ports: - containerPort: 80 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -608,7 +608,7 @@ spec: - containerPort: 9090 name: exporter nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -668,7 +668,7 @@ spec: - SETUID readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -736,7 +736,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -810,7 +810,7 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service @@ -871,7 +871,7 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service diff --git a/deploy/kubernetes/delete.sh b/deploy/kubernetes/delete.sh new file mode 100755 index 00000000..300a4069 --- /dev/null +++ b/deploy/kubernetes/delete.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +set -e + +if [ "$EUID" -eq 0 ] + then echo "Run without sudo/root" + exit +fi + +NC='\033[0m' +RED='\033[0;31m' + +delete () { + echo "Deleting sock-shop namespace resources" + kubectl delete all --all -n sock-shop + kubectl delete namespace sock-shop || true + + echo "Deleting monitoring namespace resources" + kubectl delete all --all -n monitoring + kubectl delete namespace monitoring || true + + echo "Deleting default namespace resources" + kubectl delete all --all +} + +# Check kubectl and current cluster context +echo -e "Delete sock-shop from ${RED}\"$(kubectl config current-context)\"${NC} cluster" +read -p "Continue (y/n)?" CONT +if [ "$CONT" = "y" ]; then + delete +else + exit +fi \ No newline at end of file diff --git a/deploy/kubernetes/deploy.sh b/deploy/kubernetes/deploy.sh new file mode 100755 index 00000000..a5fc6883 --- /dev/null +++ b/deploy/kubernetes/deploy.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +set -e + +if [ "$EUID" -eq 0 ] + then echo "Run without sudo/root" + exit +fi + +NC='\033[0m' +RED='\033[0;31m' + +deploy () { + echo "Deploying sock-shop namespace" + kubectl create -f manifests/sock-shop-ns.yaml + + echo "Deploying sock-shop core" + kubectl apply $(ls manifests/*[[:digit:]]*.yaml | awk ' { print " -f " $1 } ') + + echo "Deploying sock-shop-mizu extras" + kubectl apply $(ls manifests/extras/*[[:digit:]]*.yaml | awk ' { print " -f " $1 } ') + + echo "Deploying monitoring namespace" + kubectl create -f manifests-monitoring/00-monitoring-ns.yaml + + echo "Deploying Prometheus" + kubectl apply $(ls manifests-monitoring/*-prometheus-*.yaml | awk ' { print " -f " $1 } ') + + echo "Deploying Grafana" + kubectl apply $(ls manifests-monitoring/*-grafana-*.yaml | awk ' { print " -f " $1 }' | grep -v grafana-import) + + # wait for Grafana to be ready + while [[ $(kubectl get pods -l app=grafana -l component=core -n monitoring -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]]; do echo "waiting for grafana core pod" && sleep 2; done + + echo "Importing Grafana Dashboards" + kubectl apply -f manifests-monitoring/23-grafana-import-dash-batch.yaml + + # TODO: Forward Grafana and Prometheus ports + # Grafana: 3000:$NODE_IN_CLUSTER:31300 + # Prometheus: 9090:$NODE_IN_CLUSTER:31090 + + echo -e "sock-shop is running, you can access through front-end service: ${RED}\"$(kubectl get svc -l name=front-end -n sock-shop | awk ' { print $4 } ')\"${NC}" +} + +# Check kubectl and current cluster context +echo -e "Deploy sock-shop to ${RED}\"$(kubectl config current-context)\"${NC} cluster" +read -p "Continue (y/n)?" CONT +if [ "$CONT" = "y" ]; then + deploy +else + exit +fi \ No newline at end of file diff --git a/deploy/kubernetes/manifests-alerting/alertmanager-dep.yaml b/deploy/kubernetes/manifests-alerting/alertmanager-dep.yaml index 6d3902f6..0a0b825c 100644 --- a/deploy/kubernetes/manifests-alerting/alertmanager-dep.yaml +++ b/deploy/kubernetes/manifests-alerting/alertmanager-dep.yaml @@ -37,4 +37,4 @@ spec: configMap: name: alertmanager nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-jaeger/catalogue-dep.yaml b/deploy/kubernetes/manifests-jaeger/catalogue-dep.yaml index 25e4e1cb..da11b47c 100644 --- a/deploy/kubernetes/manifests-jaeger/catalogue-dep.yaml +++ b/deploy/kubernetes/manifests-jaeger/catalogue-dep.yaml @@ -53,4 +53,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-jaeger/payment-dep.yaml b/deploy/kubernetes/manifests-jaeger/payment-dep.yaml index cea93f93..f351715f 100644 --- a/deploy/kubernetes/manifests-jaeger/payment-dep.yaml +++ b/deploy/kubernetes/manifests-jaeger/payment-dep.yaml @@ -53,4 +53,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-jaeger/user-dep.yaml b/deploy/kubernetes/manifests-jaeger/user-dep.yaml index 5d337f48..7fcd02dc 100644 --- a/deploy/kubernetes/manifests-jaeger/user-dep.yaml +++ b/deploy/kubernetes/manifests-jaeger/user-dep.yaml @@ -55,4 +55,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-loadtest/loadtest-dep.yaml b/deploy/kubernetes/manifests-loadtest/loadtest-dep.yaml index 194cd2d6..809461f2 100644 --- a/deploy/kubernetes/manifests-loadtest/loadtest-dep.yaml +++ b/deploy/kubernetes/manifests-loadtest/loadtest-dep.yaml @@ -27,4 +27,4 @@ spec: command: ["/bin/sh"] args: ["-c", "while true; do locust --host http://front-end.sock-shop.svc.cluster.local -f /config/locustfile.py --clients 5 --hatch-rate 5 --num-request 100 --no-web; done"] nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-logging/elasticsearch.yml b/deploy/kubernetes/manifests-logging/elasticsearch.yml index 16440595..34555686 100644 --- a/deploy/kubernetes/manifests-logging/elasticsearch.yml +++ b/deploy/kubernetes/manifests-logging/elasticsearch.yml @@ -23,7 +23,7 @@ spec: - name: elasticsearch containerPort: 9200 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux --- apiVersion: v1 kind: Service diff --git a/deploy/kubernetes/manifests-logging/fluentd-daemon.yml b/deploy/kubernetes/manifests-logging/fluentd-daemon.yml index be3901cb..32ba4ef0 100644 --- a/deploy/kubernetes/manifests-logging/fluentd-daemon.yml +++ b/deploy/kubernetes/manifests-logging/fluentd-daemon.yml @@ -32,4 +32,4 @@ spec: hostPath: path: /var/lib/docker/containers nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-monitoring/06-prometheus-dep.yaml b/deploy/kubernetes/manifests-monitoring/06-prometheus-dep.yaml index 3384d8d5..1e694f91 100644 --- a/deploy/kubernetes/manifests-monitoring/06-prometheus-dep.yaml +++ b/deploy/kubernetes/manifests-monitoring/06-prometheus-dep.yaml @@ -42,4 +42,4 @@ spec: configMap: name: prometheus-alertrules nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests-monitoring/21-grafana-dep.yaml b/deploy/kubernetes/manifests-monitoring/21-grafana-dep.yaml index 83f7878e..17c15daa 100644 --- a/deploy/kubernetes/manifests-monitoring/21-grafana-dep.yaml +++ b/deploy/kubernetes/manifests-monitoring/21-grafana-dep.yaml @@ -50,4 +50,4 @@ spec: - name: grafana-persistent-storage emptyDir: {} nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/01-carts-dep.yaml b/deploy/kubernetes/manifests/01-carts-dep.yaml index 761f4986..3aadeff7 100644 --- a/deploy/kubernetes/manifests/01-carts-dep.yaml +++ b/deploy/kubernetes/manifests/01-carts-dep.yaml @@ -48,4 +48,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/02-carts-svc.yml b/deploy/kubernetes/manifests/02-carts-svc.yaml similarity index 100% rename from deploy/kubernetes/manifests/02-carts-svc.yml rename to deploy/kubernetes/manifests/02-carts-svc.yaml diff --git a/deploy/kubernetes/manifests/03-carts-db-dep.yaml b/deploy/kubernetes/manifests/03-carts-db-dep.yaml index 01ad4227..52870789 100644 --- a/deploy/kubernetes/manifests/03-carts-db-dep.yaml +++ b/deploy/kubernetes/manifests/03-carts-db-dep.yaml @@ -39,4 +39,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/05-catalogue-dep.yaml b/deploy/kubernetes/manifests/05-catalogue-dep.yaml index 0fd755e9..86a652c0 100644 --- a/deploy/kubernetes/manifests/05-catalogue-dep.yaml +++ b/deploy/kubernetes/manifests/05-catalogue-dep.yaml @@ -53,4 +53,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/07-catalogue-db-dep.yaml b/deploy/kubernetes/manifests/07-catalogue-db-dep.yaml index c2a1287b..83eea697 100644 --- a/deploy/kubernetes/manifests/07-catalogue-db-dep.yaml +++ b/deploy/kubernetes/manifests/07-catalogue-db-dep.yaml @@ -28,4 +28,4 @@ spec: - name: mysql containerPort: 3306 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/09-front-end-dep.yaml b/deploy/kubernetes/manifests/09-front-end-dep.yaml index 74b4cc70..958885cd 100644 --- a/deploy/kubernetes/manifests/09-front-end-dep.yaml +++ b/deploy/kubernetes/manifests/09-front-end-dep.yaml @@ -49,4 +49,4 @@ spec: initialDelaySeconds: 30 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/11-orders-dep.yaml b/deploy/kubernetes/manifests/11-orders-dep.yaml index 05c438a1..8eb16441 100644 --- a/deploy/kubernetes/manifests/11-orders-dep.yaml +++ b/deploy/kubernetes/manifests/11-orders-dep.yaml @@ -48,4 +48,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/13-orders-db-dep.yaml b/deploy/kubernetes/manifests/13-orders-db-dep.yaml index baf248c4..e19ebc14 100644 --- a/deploy/kubernetes/manifests/13-orders-db-dep.yaml +++ b/deploy/kubernetes/manifests/13-orders-db-dep.yaml @@ -39,4 +39,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/15-payment-dep.yaml b/deploy/kubernetes/manifests/15-payment-dep.yaml index 8ebf5746..da9491b0 100644 --- a/deploy/kubernetes/manifests/15-payment-dep.yaml +++ b/deploy/kubernetes/manifests/15-payment-dep.yaml @@ -50,4 +50,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/17-queue-master-dep.yaml b/deploy/kubernetes/manifests/17-queue-master-dep.yaml index 21514292..1ffc903f 100644 --- a/deploy/kubernetes/manifests/17-queue-master-dep.yaml +++ b/deploy/kubernetes/manifests/17-queue-master-dep.yaml @@ -32,4 +32,4 @@ spec: ports: - containerPort: 80 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/19-rabbitmq-dep.yaml b/deploy/kubernetes/manifests/19-rabbitmq-dep.yaml index fe843747..75547313 100644 --- a/deploy/kubernetes/manifests/19-rabbitmq-dep.yaml +++ b/deploy/kubernetes/manifests/19-rabbitmq-dep.yaml @@ -42,4 +42,4 @@ spec: - containerPort: 9090 name: exporter nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/21-session-db-dep.yaml b/deploy/kubernetes/manifests/21-session-db-dep.yaml index 5bbd2ec4..5a5014dd 100644 --- a/deploy/kubernetes/manifests/21-session-db-dep.yaml +++ b/deploy/kubernetes/manifests/21-session-db-dep.yaml @@ -34,4 +34,4 @@ spec: - SETUID readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/23-shipping-dep.yaml b/deploy/kubernetes/manifests/23-shipping-dep.yaml index 53a815eb..082d1259 100644 --- a/deploy/kubernetes/manifests/23-shipping-dep.yaml +++ b/deploy/kubernetes/manifests/23-shipping-dep.yaml @@ -50,4 +50,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/25-user-dep.yaml b/deploy/kubernetes/manifests/25-user-dep.yaml index 3e2059c9..5f57e9fc 100644 --- a/deploy/kubernetes/manifests/25-user-dep.yaml +++ b/deploy/kubernetes/manifests/25-user-dep.yaml @@ -53,4 +53,4 @@ spec: initialDelaySeconds: 180 periodSeconds: 3 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/27-user-db-dep.yaml b/deploy/kubernetes/manifests/27-user-db-dep.yaml index e76de4c0..41af09ef 100644 --- a/deploy/kubernetes/manifests/27-user-db-dep.yaml +++ b/deploy/kubernetes/manifests/27-user-db-dep.yaml @@ -40,4 +40,4 @@ spec: emptyDir: medium: Memory nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/29-mizutest-amqp-py-dep.yaml b/deploy/kubernetes/manifests/extras/29-mizutest-amqp-py-dep.yaml index 29d358d9..f6ead67c 100644 --- a/deploy/kubernetes/manifests/extras/29-mizutest-amqp-py-dep.yaml +++ b/deploy/kubernetes/manifests/extras/29-mizutest-amqp-py-dep.yaml @@ -45,4 +45,4 @@ spec: - NET_BIND_SERVICE readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/35-mizutest-kafka-py-dep.yaml b/deploy/kubernetes/manifests/extras/35-mizutest-kafka-py-dep.yaml index 0f0ba7c1..fcf70be9 100644 --- a/deploy/kubernetes/manifests/extras/35-mizutest-kafka-py-dep.yaml +++ b/deploy/kubernetes/manifests/extras/35-mizutest-kafka-py-dep.yaml @@ -40,4 +40,4 @@ spec: - NET_BIND_SERVICE readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/37-mizutest-kafka-go-dep.yaml b/deploy/kubernetes/manifests/extras/37-mizutest-kafka-go-dep.yaml index 98fb5d1d..d3c0caed 100644 --- a/deploy/kubernetes/manifests/extras/37-mizutest-kafka-go-dep.yaml +++ b/deploy/kubernetes/manifests/extras/37-mizutest-kafka-go-dep.yaml @@ -40,4 +40,4 @@ spec: # - NET_BIND_SERVICE # readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/39-mizutest-redis-go-dep.yaml b/deploy/kubernetes/manifests/extras/39-mizutest-redis-go-dep.yaml index 773816c2..8c8a2b7a 100644 --- a/deploy/kubernetes/manifests/extras/39-mizutest-redis-go-dep.yaml +++ b/deploy/kubernetes/manifests/extras/39-mizutest-redis-go-dep.yaml @@ -40,4 +40,4 @@ spec: # - NET_BIND_SERVICE # readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/41-mizutest-grpc-py-server-dep.yaml b/deploy/kubernetes/manifests/extras/41-mizutest-grpc-py-server-dep.yaml index c1f706a1..642a693a 100644 --- a/deploy/kubernetes/manifests/extras/41-mizutest-grpc-py-server-dep.yaml +++ b/deploy/kubernetes/manifests/extras/41-mizutest-grpc-py-server-dep.yaml @@ -45,4 +45,4 @@ spec: - NET_BIND_SERVICE readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/43-mizutest-grpc-py-client-dep.yaml b/deploy/kubernetes/manifests/extras/43-mizutest-grpc-py-client-dep.yaml index 78f3e2b7..8020cead 100644 --- a/deploy/kubernetes/manifests/extras/43-mizutest-grpc-py-client-dep.yaml +++ b/deploy/kubernetes/manifests/extras/43-mizutest-grpc-py-client-dep.yaml @@ -45,4 +45,4 @@ spec: - NET_BIND_SERVICE readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux diff --git a/deploy/kubernetes/manifests/extras/991-ngnix-ingress-svc.yaml b/deploy/kubernetes/manifests/extras/ngnix-ingress-svc.yaml similarity index 100% rename from deploy/kubernetes/manifests/extras/991-ngnix-ingress-svc.yaml rename to deploy/kubernetes/manifests/extras/ngnix-ingress-svc.yaml diff --git a/deploy/kubernetes/manifests/00-sock-shop-ns.yaml b/deploy/kubernetes/manifests/sock-shop-ns.yaml similarity index 100% rename from deploy/kubernetes/manifests/00-sock-shop-ns.yaml rename to deploy/kubernetes/manifests/sock-shop-ns.yaml