diff --git a/README.md b/README.md index bc06725..eb6d364 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,8 @@ We offer the following installation methods: 1. Run `kubectl get nodes` to verify you're connected to “Kubernetes on Docker”. +1. Run `kubectl create ns demo-env` to create a namespace to run the app in. + 1. Run `skaffold run` (first time will be slow, it can take ~20 minutes). This will build and deploy the application. If you need to rebuild the images automatically as you refactor the code, run `skaffold dev` command. @@ -159,6 +161,22 @@ We offer the following installation methods: kubectl port-forward deployment/frontend 8080:8080 ``` +1. Access the load generator UI through your browser + - **Minikube** requires you to run a command to access the frontend service: + + ```shell + minikube service loadgenerator + ``` + + - **Docker For Desktop** should be automatically accessible by http://localhost:8089 + + - **Kind** does not provision an IP address for the service. + You must run a port-forwarding process to access the frontend at http://localhost:8089: + + ```shell + kubectl port-forward deployment/loadgenerator 8089:8089 + ``` + ### Option 2: Running on Google Kubernetes Engine (GKE) > 💡 Recommended if you're using Google Cloud Platform and want to try it on diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index eba10e8..1a05474 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -78,6 +78,16 @@ mk_kubernetes_manifests() { out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )" done + # insert node selector + pattern="^(\s*)nodeSelector:" + replace="\1nodeSelector: \n\1 dedicated: demo-env" + out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )" + + # substitude loadgenerator port: 8089 -> 80 + pattern="^(\s*)port:\s+8089(\s*)" + replace="\1port: 80\2" + out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )" + print_license_header print_autogenerated_warning echo "${out_manifest}" diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index 20b8a19..438df82 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -32,7 +32,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: server image: adservice diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml index 9f63db8..bc6495e 100644 --- a/kubernetes-manifests/cartservice.yaml +++ b/kubernetes-manifests/cartservice.yaml @@ -32,7 +32,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: server image: cartservice diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index c3aafab..a98a1bd 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: server image: checkoutservice diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 986c56b..f62280e 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 containers: - name: server diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index 89bee9e..946294d 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 containers: - name: server diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 9ff2008..508225c 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -33,7 +33,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: server image: frontend diff --git a/kubernetes-manifests/loadgenerator.yaml b/kubernetes-manifests/loadgenerator.yaml index bada835..0571aff 100644 --- a/kubernetes-manifests/loadgenerator.yaml +++ b/kubernetes-manifests/loadgenerator.yaml @@ -33,7 +33,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 restartPolicy: Always containers: @@ -59,20 +58,6 @@ kind: Service metadata: name: loadgenerator namespace: demo-env -spec: - type: ClusterIP - selector: - app: loadgenerator - ports: - - name: http - port: 80 - targetPort: 8089 ---- -apiVersion: v1 -kind: Service -metadata: - name: loadgenerator-external - namespace: demo-env annotations: service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0 service.beta.kubernetes.io/aws-load-balancer-healthcheck-interval: "5" @@ -85,5 +70,5 @@ spec: app: loadgenerator ports: - name: http - port: 80 + port: 8089 targetPort: 8089 diff --git a/kubernetes-manifests/namespace.yaml b/kubernetes-manifests/namespace.yaml deleted file mode 100644 index bb468f3..0000000 --- a/kubernetes-manifests/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: demo-env diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml index c805791..ff8df13 100644 --- a/kubernetes-manifests/paymentservice.yaml +++ b/kubernetes-manifests/paymentservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 containers: - name: server diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 1013648..b549037 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 containers: - name: server diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index b21f12a..3d097f3 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env terminationGracePeriodSeconds: 5 containers: - name: server diff --git a/kubernetes-manifests/redis.yaml b/kubernetes-manifests/redis.yaml index c7d90a8..7bc42f2 100644 --- a/kubernetes-manifests/redis.yaml +++ b/kubernetes-manifests/redis.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: redis image: redis:alpine diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 839848a..7c82b5e 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -31,7 +31,6 @@ spec: operator: Equal value: demo-env nodeSelector: - dedicated: demo-env containers: - name: server image: shippingservice