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.

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

Cherrypick #1235 #1300

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Cherrypick #1235 #1300

merged 1 commit into from
Nov 30, 2020

Conversation

jayanthvn
Copy link
Contributor

What type of PR is this?
cherry-pic #1235 for branch 1.7

Which issue does this PR fix:
#1235

What does this PR do / Why do we need it:
n/a

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
n/a

Testing done on this change:

Yes

Automation added to e2e:

n/a

Will this break upgrades or downgrades. Has updating a running cluster been tested?:
n/a

Does this change require updates to the CNI daemonset config files to work?:

n/a

Does this PR introduce any user-facing change?:

n/a


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

* Update calico to v3.16.1

* Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT override in Typha too

* Update to v3.16.2
@jayanthvn jayanthvn added this to the v1.7.6 milestone Nov 30, 2020
@jayanthvn jayanthvn requested a review from haouc November 30, 2020 19:03
@jayanthvn jayanthvn changed the base branch from master to release-1.7 November 30, 2020 19:03
Copy link
Contributor

@haouc haouc left a comment

Choose a reason for hiding this comment

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

lgtm, thanks.

@jayanthvn jayanthvn merged commit ebf42c6 into aws:release-1.7 Nov 30, 2020
@jayanthvn jayanthvn deleted the cherrypick_calico branch November 30, 2020 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants