Skip to content

Revert "cni-install: bump to v0.4.0, switch to ConfList"#21207

Merged
joamaki merged 1 commit intocilium:masterfrom
squeed:revert-cni-version-bump
Sep 6, 2022
Merged

Revert "cni-install: bump to v0.4.0, switch to ConfList"#21207
joamaki merged 1 commit intocilium:masterfrom
squeed:revert-cni-version-bump

Conversation

@squeed
Copy link
Copy Markdown
Contributor

@squeed squeed commented Sep 5, 2022 •
edited
Loading

This caused failures in the test job jenkins-1.16-4.9.

This reverts commit fa5b1fc.

@maintainer-s-little-helper

This comment was marked as resolved.

Sign in to view
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Sep 5, 2022
@tklauser
Copy link
Copy Markdown
Member

tklauser commented Sep 5, 2022

/test-1.16-4.9

@squeed
Revert "cni-install: bump to v0.4.0, switch to ConfList"
d564849 
This caused failures in the test job jenkins-1.16-4.9.

This reverts commit fa5b1fc.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
@squeed squeed force-pushed the revert-cni-version-bump branch from e93e6d9 to d564849 Compare September 6, 2022 09:01
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Sep 6, 2022
@squeed squeed marked this pull request as ready for review September 6, 2022 09:02
@squeed squeed requested a review from a team as a code owner September 6, 2022 09:02
@squeed squeed requested a review from tommyp1ckles September 6, 2022 09:02
@pchaigno pchaigno added the release-note/misc This PR makes changes that have no direct user impact. label Sep 6, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 6, 2022
@pchaigno pchaigno added area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Sep 6, 2022
@pchaigno
Copy link
Copy Markdown
Member

pchaigno commented Sep 6, 2022 •
edited
Loading

This is reverting a commit that broke an end-to-end test on master (4.9 CI job), so marking ready to merge. The test ran before the last push.

@joamaki joamaki merged commit aed5b18 into cilium:master Sep 6, 2022
This was referenced Sep 6, 2022
Merged
Merged
@joestringer joestringer mentioned this pull request Sep 6, 2022
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

@pchaigno pchaigno pchaigno approved these changes

@tommyp1ckles tommyp1ckles Awaiting requested review from tommyp1ckles tommyp1ckles was automatically assigned from cilium/sig-k8s

Assignees

No one assigned

Labels

area/cni Impacts the Container Networking Interface between Cilium and the orchestrator. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@squeed @tklauser @pchaigno @joamaki