-
Notifications
You must be signed in to change notification settings - Fork 39.4k
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
Remove rktnetes code #61432
Remove rktnetes code #61432
Conversation
/ok-to-test |
/hold cancel |
Just being extra extra careful... 😁 Thanks for triggering the tests! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there anything in the Godep that we should clean up now that the entire kubelet/rkt package is gone?
pkg/kubelet/config/flags.go
Outdated
fs.MarkDeprecated("rkt-api-endpoint", "will be removed in a future version. Rktnetes has been deprecated in favor of rktlet (https://github.com/kubernetes-incubator/rktlet).") | ||
fs.StringVar(&s.RktStage1Image, "rkt-stage1-image", s.RktStage1Image, "image to use as stage1. Local paths and http/https URLs are supported. If empty, the 'stage1.aci' in the same directory as '--rkt-path' will be used.") | ||
fs.MarkDeprecated("rkt-stage1-image", "will be removed in a future version. Rktnetes has been deprecated in favor of rktlet (https://github.com/kubernetes-incubator/rktlet).") | ||
// Rkt-specific settings: These are here for backwards compatibility, but rkt support has been removed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm... I think we should just remove these flags. If users are still setting those, it's a serious issue because the rkt is no longer supported. Kubelet should fail loudly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, removed those. Makes sense.
} | ||
|
||
// rktnetes cannot be run with CRI. | ||
if containerRuntime != kubetypes.RktContainerRuntime { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume you simply remove the if
? It's hard to tell from looking at the diff.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is much easier to see if you ignore whitespace
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, indeed better asking GitHub to ignore whitespace when looking at the diff.
To answer your question: Yes, only the "if" was removed, and indentation adjusted.
I'll take a look at Godeps and see if there are dependencies that go away... Should we do this in this same PR or in a follow up? There are also some references to RKT_* variables under cluster/, but I'd like to deal with those in a follow up, in order to reduce risk. |
Hi @yujuhong, Is there a procedure to maintain/update the Godeps? I didn't find a script under hack/ that would update it or re-generate it... Do I need to save/restore? If you could point me at a documentation for the steps used to maintain that, that'd be great! Thanks, |
Ok so I looked into it, by running: $ hack/run-in-gopath.sh hack/godep-restore.sh
$ hack/run-in-gopath.sh hack/godep-save.sh It removed packages I don't know how related those are to this PR, from the looks of it, I think they aren't... So I think I'd prefer not to push a Godeps commit in this PR and do that separately. Let me know if you agree with that. (Also, it turns out my Cheers! |
The first two are related and were imports in the |
Ok, let me adjust my Cheers, |
Ok, so I added a second commit to handle Godeps and a third to remove the references from the shell scripts. PTAL. Cheers! |
mkdir ${ACI_DIR} | ||
|
||
# Download rkt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jingxu97 is it ok to remove the rkt code from the gci mounter script?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ping @jingxu97
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think so.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall. I'm not sure about the GCI mounter bits, and would like defer to storage team (@jingxu97) to confirm.
pkg/kubelet/types/constants.go
Outdated
RemoteContainerRuntime = "remote" | ||
|
||
// rkt is deprecated and it won't really work. | ||
// We break execution when it's requested. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a TODO stating when this can be removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the constant (since it's used in a single place) but I left in place the check that breaks and warns to use rktlet instead. I imagine we can leave that check around, it doesn't really hurt a lot... Right?
rktnetes is scheduled to be deprecated in 1.10 (kubernetes#53601). According to the deprecation policy for beta CLI and flags, we can remove the feature in 1.11. Fixes kubernetes#58721
This was done by executing the following two commands: $ hack/run-in-gopath.sh hack/godep-save.sh $ hack/run-in-gopath.sh hack/godep-restore.sh Go packages github.com/appc/spec and github.com/coreos/go-systemd were used by the rkt/ package that is now gone.
/retest |
/test pull-kubernetes-verify It's saying "Could not resolve host: github.com" 😵 |
/retest |
/lgtm |
/lgtm |
Now I'm seeing what looks like a stack overflow in RangeAllocator-KubeQPS10-Nodes10... I've seen that before and it looks like it affect other PRs too... Let's keep trying. /retest |
FYI, filed #61854 for the ipam test failure. |
Let's see if we'll bump into #61854 again... |
/assign @dchen1107 |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dashpole, dchen1107, filbranden, yujuhong The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Automatic merge from submit-queue (batch tested with PRs 61904, 61565, 61401, 61432, 61772). If you want to cherry-pick this change to another branch, please follow the instructions here. |
What this PR does / why we need it:
rktnetes is scheduled to be deprecated in 1.10 (#53601). According to the deprecation policy for beta CLI and flags, we can remove the feature in 1.11.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #58721
Special notes for your reviewer:
Release note:
/assign @yujuhong
/hold
Hold until the end of the freeze.