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

v1.7 backport 2020-11-11 #13987

Merged
merged 2 commits into from Nov 13, 2020
Merged

v1.7 backport 2020-11-11 #13987

merged 2 commits into from Nov 13, 2020

Conversation

twpayne
Copy link
Contributor

@twpayne twpayne commented Nov 11, 2020

v1.7 backports 2020-11-11

Once this PR is merged, you can update the PR labels via:

$ for pr in 13937 13969; do contrib/backporting/set-labels.py $pr done 1.7; done

@twpayne twpayne added kind/backports This PR provides functionality previously merged into master. backport/1.7 labels Nov 11, 2020
@twpayne twpayne requested a review from a team as a code owner November 11, 2020 14:32
@twpayne twpayne requested review from christarazi and removed request for a team November 11, 2020 14:32
@twpayne
Copy link
Contributor Author

twpayne commented Nov 11, 2020

@aanm @nebril This is my first backport attempt and there were a lot of conflicts to resolve. Close review appreciated.

@tklauser
Copy link
Member

test-backport-1.7

tklauser
tklauser requested changes Nov 11, 2020
View reviewed changes
install/kubernetes/cilium/values.yaml Outdated Show resolved Hide resolved
@tklauser
Copy link
Member

test-backport-1.7

nebril
nebril approved these changes Nov 12, 2020
View reviewed changes
Copy link
Member

@nebril nebril left a comment

Choose a reason for hiding this comment

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

lgtm

aanm
aanm requested changes Nov 12, 2020
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

the quick-install.yaml file is out of sync, you need to run make -C install/kubernetes/

aanm and others added 2 commits November 12, 2020 12:16
@aanm @twpayne
change default docker image repository from docker.io to quay.io
52fd2e2 
[ upstream commit 434b056 ]

With the recent limitations introduced by Docker, docker hub has been
rate limiting docker pulls on images for non-registered users. To avoid
this limitation we should switch the default container image
repositories to quay.io.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Tom Payne <tom@isovalent.com>
@nebril @twpayne
ci: log in to docker in vagrant boxes
4b3062a 
[ upstream commit 238262f ]

Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
Signed-off-by: Tom Payne <tom@isovalent.com>
@twpayne
Copy link
Contributor Author

twpayne commented Nov 12, 2020

the quick-install.yaml file is out of sync, you need to run make -C install/kubernetes/

Thanks, done.

@twpayne
Copy link
Contributor Author

twpayne commented Nov 12, 2020

test-backport-1.7

@aanm aanm merged commit e0fc12f into v1.7 Nov 13, 2020
@aanm aanm deleted the pr/v1.7-backport-2020-11-11 branch November 13, 2020 10:04
@joestringer joestringer mentioned this pull request Dec 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

@nebril nebril nebril approved these changes

@christarazi christarazi christarazi approved these changes

@aanm aanm aanm approved these changes

@jrajahalme jrajahalme Awaiting requested review from jrajahalme

Assignees

@tklauser tklauser

@nebril nebril

@christarazi christarazi

@aanm aanm

@jrajahalme jrajahalme

Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@twpayne @tklauser @nebril @christarazi @aanm @jrajahalme