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(releases): updating Alpine to 3.11 #672

Merged
merged 10 commits into from
May 13, 2020
+5 −5
Merged

chore(releases): updating Alpine to 3.11 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
389112c
chore(releases): updating Alpine to 3.11
subnetmarco Apr 10, 2020
c1b4885
merging with master
subnetmarco Apr 18, 2020
d8804e6
Merge remote-tracking branch 'origin/master' into chore/update-alpine
May 12, 2020
780d421
chore(test)fix ip resolve in kuma-example-installer
May 12, 2020
e6444d6
chore(makefile) depend docker image files on docker/save/*
May 12, 2020
0e97860
chore(makefile) create the image before docker/save
May 12, 2020
edd37ef
Merge remote-tracking branch 'origin/master' into chore/update-alpine
May 13, 2020
1fec421
chore(*) revert Makefile changes
May 13, 2020
e249227
cohre(*) bump circleci vm image version
May 13, 2020
7050efb
chore(*) use getent hosts to resolve the IP
May 13, 2020
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ reusable:
- &circleci_golang_image "circleci/golang:1.14.2"

vm_images:
- &ubuntu_vm_image "ubuntu-1604:201903-01"
- &ubuntu_vm_image "ubuntu-1604:202004-01"

snippets:

Expand Down
2 changes: 1 addition & 1 deletion tools/e2e/examples/docker-compose/kuma-example-installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
#

function resolve_ip {
nslookup "${1}" 2>/dev/null | tail -1 | awk '{print $3}'
getent hosts ${DATAPLANE_HOSTNAME} 2>/dev/null | awk -e '{ print $1 }'
Copy link
Contributor

Choose a reason for hiding this comment

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

That's nice! Do you think we need to get local IP the same way here:
https://github.com/Kong/kuma/blob/master/pkg/plugins/runtime/k8s/webhooks/injector/injector.go#L169
and here: https://github.com/Kong/kuma/blob/master/pkg/plugins/runtime/k8s/webhooks/injector/injector.go#L185

Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure what you mean, but if you refer to resolving localhost that might be a thing. You should try it.
BTW all the credit for this specific solution should go to @jakubdyszkiewicz for finding it. I tried other tricks.

}

function fail {
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kuma-cp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11

ADD $KUMA_ROOT/build/artifacts-linux-amd64/kuma-cp/kuma-cp /usr/bin

Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kuma-prometheus-sd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11

ADD $KUMA_ROOT/build/artifacts-linux-amd64/kuma-prometheus-sd/kuma-prometheus-sd /usr/bin

Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kumactl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11

RUN apk add --no-cache curl

Expand Down