Remove rktnetes code #61432

filbranden · 2018-03-20T20:33:52Z

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:

Removed rknetes code, which was deprecated in 1.10.

/assign @yujuhong
/hold

Hold until the end of the freeze.

dashpole · 2018-03-20T20:34:36Z

/ok-to-test

dashpole · 2018-03-20T20:35:46Z

/hold cancel
It wont merge until freeze is over anyways

filbranden · 2018-03-20T20:49:01Z

It wont merge until freeze is over anyways

Just being extra extra careful... 😁

Thanks for triggering the tests!

yujuhong

Is there anything in the Godep that we should clean up now that the entire kubelet/rkt package is gone?

yujuhong · 2018-03-21T01:44:33Z

pkg/kubelet/config/flags.go

-	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.


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.

Done, removed those. Makes sense.

yujuhong · 2018-03-21T01:46:36Z

pkg/kubelet/kubelet.go

-	}
-
-	// rktnetes cannot be run with CRI.
-	if containerRuntime != kubetypes.RktContainerRuntime {


I assume you simply remove the if? It's hard to tell from looking at the diff.

It is much easier to see if you ignore whitespace

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.

filbranden · 2018-03-21T17:26:18Z

Is there anything in the Godep that we should clean up now that the entire kubelet/rkt package is gone?

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.

filbranden · 2018-03-21T17:40:37Z

Is there anything in the Godep that we should clean up now that the entire kubelet/rkt package is gone?

I'll take a look at Godeps and see if there are dependencies that go away...

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,
Filipe

yujuhong · 2018-03-21T18:02:39Z

https://github.com/kubernetes/community/blob/94a104dcf3b74f5b3c2ea40eb075aff52fffd754/contributors/devel/godep.md

filbranden · 2018-03-22T15:56:40Z

Is there anything in the Godep that we should clean up now that the entire kubelet/rkt package is gone?

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 github.com/appc/spec, github.com/coreos/go-systemd and go4.org/errorutil.

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 .gitconfig has settings that affect the output of Godeps, in particular the SHA1s in Godeps.json, so my running it produces some spurious changes that would probably best be avoided...)

Cheers!
Filipe

dashpole · 2018-03-22T16:05:59Z

The first two are related and were imports in the rkt directory, and should be removed. The third doesn't look related, but it is generally a good thing to remove go dependencies that are unused.

filbranden · 2018-03-22T16:28:48Z

The first two are related and were imports in the rkt directory, and should be removed. The third doesn't look related, but it is generally a good thing to remove go dependencies that are unused.

Ok, let me adjust my .gitconfig temporarily and re-run that... I'll produce an extra commit to push on top of this one.

Cheers,
Filipe

filbranden · 2018-03-22T16:51:42Z

Ok, so I added a second commit to handle Godeps and a third to remove the references from the shell scripts. PTAL.

Cheers!
Filipe

yujuhong · 2018-03-26T16:23:45Z

cluster/gce/gci/mounter/stage-upload.sh

 mkdir ${ACI_DIR}

-# Download rkt


@jingxu97 is it ok to remove the rkt code from the gci mounter script?

Ping @jingxu97

Yes, I think so.

yujuhong

Looks good overall. I'm not sure about the GCI mounter bits, and would like defer to storage team (@jingxu97) to confirm.

yujuhong · 2018-03-26T16:25:21Z

pkg/kubelet/types/constants.go

 	RemoteContainerRuntime = "remote"

+	// rkt is deprecated and it won't really work.
+	// We break execution when it's requested.


Add a TODO stating when this can be removed

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.

filbranden · 2018-03-27T16:59:00Z

/retest

filbranden · 2018-03-27T17:37:21Z

/test pull-kubernetes-verify

It's saying "Could not resolve host: github.com" 😵

filbranden · 2018-03-28T17:34:23Z

/retest

yujuhong · 2018-03-28T18:29:08Z

/lgtm

dashpole · 2018-03-28T18:31:44Z

/lgtm

filbranden · 2018-03-28T18:37:39Z

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

yujuhong · 2018-03-28T18:55:55Z

FYI, filed #61854 for the ipam test failure.

filbranden · 2018-03-28T20:48:00Z

Let's see if we'll bump into #61854 again...
/retest

filbranden · 2018-03-29T03:38:52Z

/assign @cblecker
Can you please approve for Godeps/ + vendor/ + hack/ ?

/assign @vishh
Can you please approve for cluster/gce/ ?

Thanks!

yujuhong · 2018-03-29T15:30:31Z

/assign @dchen1107
for approval

dchen1107 · 2018-03-29T17:29:20Z

/approve

k8s-ci-robot · 2018-03-29T17:30:19Z

[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:

~~Godeps/OWNERS~~ [dchen1107]
~~cluster/gce/OWNERS~~ [dchen1107]
~~cmd/kubelet/OWNERS~~ [dchen1107,yujuhong]
~~hack/OWNERS~~ [dchen1107]
~~pkg/kubelet/OWNERS~~ [dchen1107,yujuhong]
~~vendor/OWNERS~~ [dchen1107]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-github-robot · 2018-03-29T18:46:17Z

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.

k8s-ci-robot assigned yujuhong Mar 20, 2018

k8s-ci-robot requested review from dashpole and ncdc March 20, 2018 20:33

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 20, 2018

k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 20, 2018

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 20, 2018

filbranden force-pushed the killrkt1 branch from 0805475 to b51d6c0 Compare March 20, 2018 21:22

yujuhong reviewed Mar 21, 2018

View reviewed changes

filbranden force-pushed the killrkt1 branch from b51d6c0 to 27189df Compare March 21, 2018 17:18

filbranden force-pushed the killrkt1 branch from 293ae23 to 5d3cceb Compare March 22, 2018 18:04

yujuhong reviewed Mar 26, 2018

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 26, 2018

filbranden added 3 commits March 27, 2018 09:29

Remove rktnetes code

8df9274

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

Remove references to rkt from shell scripts in cluster/ and hack/.

366ad30

filbranden force-pushed the killrkt1 branch from 5d3cceb to 366ad30 Compare March 27, 2018 16:37

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 27, 2018

yujuhong assigned jingxu97 Mar 27, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 28, 2018

k8s-ci-robot assigned dashpole Mar 28, 2018

k8s-ci-robot assigned cblecker and vishh Mar 29, 2018

k8s-ci-robot assigned dchen1107 Mar 29, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 29, 2018

k8s-github-robot merged commit 399b835 into kubernetes:master Mar 29, 2018

filbranden mentioned this pull request Mar 29, 2018

Remove rktnetes labels and configs kubernetes/test-infra#7473

Merged

Pingan2017 mentioned this pull request Nov 12, 2018

Mark ‘rkt’ as deprecated for '--container-runtime' kubernetes/website#10895

Merged

Remove rktnetes code #61432

Remove rktnetes code #61432

Conversation

filbranden commented Mar 20, 2018

dashpole commented Mar 20, 2018

dashpole commented Mar 20, 2018

filbranden commented Mar 20, 2018

yujuhong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

filbranden commented Mar 21, 2018

filbranden commented Mar 21, 2018

yujuhong commented Mar 21, 2018

filbranden commented Mar 22, 2018

dashpole commented Mar 22, 2018

filbranden commented Mar 22, 2018

filbranden commented Mar 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yujuhong left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

filbranden commented Mar 27, 2018

filbranden commented Mar 27, 2018

filbranden commented Mar 28, 2018

yujuhong commented Mar 28, 2018

dashpole commented Mar 28, 2018

filbranden commented Mar 28, 2018

yujuhong commented Mar 28, 2018

filbranden commented Mar 28, 2018

filbranden commented Mar 29, 2018

yujuhong commented Mar 29, 2018

dchen1107 commented Mar 29, 2018

k8s-ci-robot commented Mar 29, 2018

k8s-github-robot commented Mar 29, 2018

yujuhong left a comment •

edited

Loading