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

Feat (dev env): allow to custom registry port for make kind-up #1417

Merged
merged 3 commits into from
Nov 16, 2022
Merged

Feat (dev env): allow to custom registry port for make kind-up #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adb6c26
make: allow to custom registry port for `make kind-up`
zou8944 Oct 31, 2022
5b96086
update: grammatical simplification
zou8944 Nov 3, 2022
f5c36a0
fix: local registry mirror's endpoint port should be fixed 5000
zou8944 Nov 3, 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
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ default: help

VERSION ?= 1.5.0
RELEASE_SRC = apache-apisix-ingress-controller-${VERSION}-src
REGISTRY ?="localhost:5000"
REGISTRY_PORT ?= "5000"
REGISTRY ?="localhost:$(REGISTRY_PORT)"
IMAGE_TAG ?= dev
ENABLE_PROXY ?= true

Expand Down Expand Up @@ -146,7 +147,7 @@ endif
### kind-up: Launch a Kubernetes cluster with a image registry by Kind.
.PHONY: kind-up
kind-up:
./utils/kind-with-registry.sh
./utils/kind-with-registry.sh $(REGISTRY_PORT)
### kind-reset: Delete the Kubernetes cluster created by "make kind-up"
.PHONY: kind-reset
kind-reset:
Expand Down
4 changes: 2 additions & 2 deletions utils/kind-with-registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fi
kind_version=$(kind version)
kind_network='kind'
reg_name='kind-registry'
reg_port='5000'
reg_port="${1:-5000}"
case "${kind_version}" in
"kind v0.7."* | "kind v0.6."* | "kind v0.5."*)
kind_network='bridge'
Expand Down Expand Up @@ -67,7 +67,7 @@ nodes:
containerdConfigPatches:
- |-
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${reg_port}"]
endpoint = ["http://${reg_host}:${reg_port}"]
endpoint = ["http://${reg_host}:5000"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @tao12345666333 @lingsamuel , I update this port, it should be fixed 5000 port.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @tao12345666333 @lingsamuel , I update this port, it should be fixed 5000 port.

why it should be 5000?

Copy link
Contributor Author

@zou8944 zou8944 Nov 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tao12345666333 the endpoint will be visit by k8s node which kind created, so the port should be the one that registry exposed (which is 5000 fixed), not the one that registry published on our local machine.
you can also refer to the kind doc, and pay attention to this part
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, I miss it.

EOF

for node in $(kind get nodes --name "${KIND_CLUSTER_NAME}"); do
Expand Down