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

Jump to bottom

Makefile: use CLI options to set local images for kind-install-cilium-clustermesh #25810

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Makefile: use CLI options to set local images for kind-install-cilium-clustermesh #25810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,8 @@ kind-install-cilium-clustermesh: kind-clustermesh-ready ## Install a local Ciliu
$(CILIUM_CLI) install \
--chart-directory=$(ROOT_DIR)/install/kubernetes/cilium \
--helm-values=$(ROOT_DIR)/contrib/testing/kind-clustermesh1.yaml \
--agent-image=$(LOCAL_AGENT_IMAGE) \
--operator-image=$(LOCAL_OPERATOR_IMAGE) \
--version=
@echo " INSTALL cilium on clustermesh2 cluster"
kubectl config use kind-clustermesh2
Expand All @@ -471,6 +473,8 @@ kind-install-cilium-clustermesh: kind-clustermesh-ready ## Install a local Ciliu
--inherit-ca kind-clustermesh1 \
--chart-directory=$(ROOT_DIR)/install/kubernetes/cilium \
--helm-values=$(ROOT_DIR)/contrib/testing/kind-clustermesh2.yaml \
--agent-image=$(LOCAL_AGENT_IMAGE) \
--operator-image=$(LOCAL_OPERATOR_IMAGE) \
--version=
@echo " Enabling clustermesh"
$(CILIUM_CLI) clustermesh enable --context kind-clustermesh1 --service-type NodePort --apiserver-image $(LOCAL_CLUSTERMESH_IMAGE)
Expand Down
3 changes: 0 additions & 3 deletions contrib/testing/kind-clustermesh1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ cluster:
debug:
enabled: true
image:
override: "localhost:5000/cilium/cilium-dev:local"
pullPolicy: Never
operator:
image:
override: "localhost:5000/cilium/operator-generic:local"
pullPolicy: Never
suffix: ""
ipam:
mode: kubernetes
ipv6:
Expand Down
3 changes: 0 additions & 3 deletions contrib/testing/kind-clustermesh2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ cluster:
debug:
enabled: true
image:
override: "localhost:5000/cilium/cilium-dev:local"
pullPolicy: Never
operator:
image:
override: "localhost:5000/cilium/operator-generic:local"
pullPolicy: Never
suffix: ""
ipam:
mode: kubernetes
ipv6:
Expand Down