Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(demo): update demo to latest version #4572

Merged
merged 2 commits into from
Jul 11, 2022
Merged

chore(demo): update demo to latest version #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53357f3
chore(demo): update demo to latest version
lahabana Jul 8, 2022
5bb5f2b
fix(ci): format files
github-actions[bot] Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/kumactl/cmd/install/testdata/install-demo.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions app/kumactl/cmd/install/testdata/install-demo.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/kumactl/data/install/k8s/demo/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions mk/dev.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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