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

test: K8sUpdates: Remove deprecated code #15349

Merged

Conversation

pchaigno
Copy link
Member

K8sUpdates now only tests upgrade and downgrades between 1.9 and master, so code to handle Cilium <1.8 can be removed.

K8sUpdates now only tests upgrade and downgrades between 1.9 and master,
so code to handle Cilium <1.8 can be removed.

Signed-off-by: Paul Chaignon <paul@cilium.io>
@pchaigno pchaigno added area/CI Continuous Integration testing issue or flake kind/cleanup This includes no functional changes. release-note/ci This PR makes changes to the CI. labels Mar 15, 2021
@pchaigno pchaigno requested a review from a team March 15, 2021 15:08
@pchaigno pchaigno requested a review from a team as a code owner March 15, 2021 15:08
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Mar 15, 2021
@jibi jibi removed their assignment Mar 15, 2021
@pchaigno
Copy link
Member Author

test-me-please

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Actually, one question: Before there were "default" cases in the switch case, shouldn't the new version of the code just retain that piece and drop the other parts?

@pchaigno
Copy link
Member Author

Before there were "default" cases in the switch case, shouldn't the new version of the code just retain that piece and drop the other parts?

Good question 😸 The default case sets debug.enabled=false and devices=privateIface.

devices is already set in

cilium/test/helpers/kubectl.go

Lines 2369 to 2379 in 049b611

// Set devices
privateIface, err := kub.GetPrivateIface()
if err != nil {
return err
}
defaultIface, err := kub.GetDefaultIface()
if err != nil {
return err
}
devices := fmt.Sprintf(`'{%s,%s}'`, privateIface, defaultIface)
addIfNotOverwritten(options, "devices", devices)
although with a slightly different value. The K8sUpdates test passes on net-next and 4.19 so I don't think the slight difference is an issue.

debug.enabled was set to false to disable the datapath's debug mode. The agent and datapath debug modes are now separate and datapath debug mode is already disabled by default. So this change isn't needed anymore.

@pchaigno
Copy link
Member Author

Unrelated tests failed in https://jenkins.cilium.io/job/Cilium-PR-K8s-1.19-kernel-4.19/4976/ because of #15337. All reviews are in. Marking as ready to merge.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 16, 2021
@joestringer joestringer merged commit 1f03b67 into cilium:master Mar 16, 2021
1.10.0 automation moved this from In progress to Done Mar 16, 2021
@pchaigno pchaigno deleted the k8supdates-remove-deprecated-code branch March 16, 2021 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants