Merge branch 'master' into dependabot/go_modules/sigs.k8s.io/controll…

…er-runtime-0.12.3
kumahq · Jul 12, 2022 · bbd80a5 · bbd80a5
2 parents 9a42133 + b5ef221
commit bbd80a5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
       - run: npm install -g @commitlint/cli @commitlint/config-conventional
       - name: "Check PR title"
         # Inject as env variable to escape properly

diff --git a/.github/workflows/pr-merged.yaml b/.github/workflows/pr-merged.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Send repository dispatch event"
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.NOTIFY_GH_TOKEN }}
           script: |

diff --git a/app/kumactl/cmd/install/testdata/install-demo.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-demo.defaults.golden.yaml
@@ -54,7 +54,7 @@ spec:
             - name: tcp
               containerPort: 6379
           lifecycle:
-            preStop:
+            preStop: # delay shutdown to support graceful mesh leave
               exec:
                 command: ["/bin/sleep", "30"]
             postStart:
@@ -78,7 +78,7 @@ spec:
     spec:
       containers:
         - name: demo-app
-          image: "thefosk/kuma-demo"
+          image: "kumahq/kuma-demo"
           env:
             - name: REDIS_HOST
               value: "redis.kuma-demo.svc.cluster.local"

diff --git a/app/kumactl/cmd/install/testdata/install-demo.overrides.golden.yaml b/app/kumactl/cmd/install/testdata/install-demo.overrides.golden.yaml
@@ -54,7 +54,7 @@ spec:
             - name: tcp
               containerPort: 6379
           lifecycle:
-            preStop:
+            preStop: # delay shutdown to support graceful mesh leave
               exec:
                 command: ["/bin/sleep", "30"]
             postStart:
@@ -78,10 +78,10 @@ spec:
     spec:
       containers:
         - name: demo-app
-          image: "thefosk/kuma-demo"
+          image: "kumahq/kuma-demo"
           env:
             - name: REDIS_HOST
-              value: "redis.kuma-demo.svc.cluster.local"
+              value: "redis.not-kuma-demo.svc.cluster.local"
             - name: REDIS_PORT
               value: "6379"
             - name: APP_VERSION

diff --git a/app/kumactl/data/install/k8s/demo/demo.yaml b/app/kumactl/data/install/k8s/demo/demo.yaml
@@ -27,7 +27,7 @@ spec:
             - name: tcp
               containerPort: 6379
           lifecycle:
-            preStop:
+            preStop: # delay shutdown to support graceful mesh leave
               exec:
                 command: ["/bin/sleep", "30"]
             postStart:
@@ -63,10 +63,10 @@ spec:
     spec:
       containers:
         - name: demo-app
-          image: "thefosk/kuma-demo"
+          image: "kumahq/kuma-demo"
           env:
             - name: REDIS_HOST
-              value: "redis.kuma-demo.svc.cluster.local"
+              value: "redis.{{ .Namespace }}.svc.cluster.local"
             - name: REDIS_PORT
               value: "6379"
             - name: APP_VERSION

diff --git a/mk/dev.mk b/mk/dev.mk
@@ -343,3 +343,11 @@ dev/envrc: $(KUBECONFIG_DIR)/kind-kuma-current ## Generate .envrc
 	done >> .envrc
 	@echo 'export KUBEBUILDER_ASSETS=$${CI_TOOLS_DIR}' >> .envrc
 	@direnv allow
+
+.PHONY: dev/sync-demo
+dev/sync-demo:
+	rm app/kumactl/data/install/k8s/demo/demo.yaml
+	curl -s https://raw.githubusercontent.com/kumahq/kuma-counter-demo/master/demo.yaml | \
+		sed 's/"local"/"{{ .Zone }}"/g' | \
+		sed 's/\([^/]\)kuma-demo/\1{{ .Namespace }}/g' \
+		> app/kumactl/data/install/k8s/demo/demo.yaml