From 59741bdfbdc7dee2feb825cb92218261d0f5d264 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Fri, 6 Apr 2018 12:02:11 -0700 Subject: [PATCH] Remove rkt references in the codebase --- build/root/Makefile | 2 +- pkg/kubelet/apis/stats/v1alpha1/types.go | 2 +- pkg/kubelet/container/runtime.go | 2 +- pkg/kubelet/kubelet_network.go | 2 +- test/e2e/common/init_container.go | 8 -------- test/e2e/framework/test_context.go | 4 ++-- test/e2e/kubectl/kubectl.go | 5 ----- test/e2e_node/cpu_manager_test.go | 3 --- test/test_owners.csv | 1 - 9 files changed, 6 insertions(+), 23 deletions(-) diff --git a/build/root/Makefile b/build/root/Makefile index 143140d83b..c7e16e90e6 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -251,7 +251,7 @@ define TEST_E2E_NODE_HELP_INFO # GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs. # Defaults to false. # PARALLELISM: The number of gingko nodes to run. Defaults to 8. -# RUNTIME: Container runtime to use (eg. docker, rkt, remote). +# RUNTIME: Container runtime to use (eg. docker, remote). # Defaults to "docker". # CONTAINER_RUNTIME_ENDPOINT: remote container endpoint to connect to. # Used when RUNTIME is set to "remote". diff --git a/pkg/kubelet/apis/stats/v1alpha1/types.go b/pkg/kubelet/apis/stats/v1alpha1/types.go index 2f7f56e4bb..ecffb8bc34 100644 --- a/pkg/kubelet/apis/stats/v1alpha1/types.go +++ b/pkg/kubelet/apis/stats/v1alpha1/types.go @@ -83,7 +83,7 @@ type RuntimeStats struct { const ( // SystemContainerKubelet is the container name for the system container tracking Kubelet usage. SystemContainerKubelet = "kubelet" - // SystemContainerRuntime is the container name for the system container tracking the runtime (e.g. docker or rkt) usage. + // SystemContainerRuntime is the container name for the system container tracking the runtime (e.g. docker) usage. SystemContainerRuntime = "runtime" // SystemContainerMisc is the container name for the system container tracking non-kubernetes processes. SystemContainerMisc = "misc" diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index 9ebdf66d9f..29852d435e 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -198,7 +198,7 @@ type PodPair struct { // ContainerID is a type that identifies a container. type ContainerID struct { - // The type of the container runtime. e.g. 'docker', 'rkt'. + // The type of the container runtime. e.g. 'docker'. Type string // The identification of the container, this is comsumable by // the underlying container runtime. (Note that the container diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index c33b5a7ed0..8656a7f5be 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -187,7 +187,7 @@ func (kl *Kubelet) updatePodCIDR(cidr string) { } // kubelet -> generic runtime -> runtime shim -> network plugin - // docker/rkt non-cri implementations have a passthrough UpdatePodCIDR + // docker/non-cri implementations have a passthrough UpdatePodCIDR if err := kl.getRuntime().UpdatePodCIDR(cidr); err != nil { glog.Errorf("Failed to update pod CIDR: %v", err) return diff --git a/test/e2e/common/init_container.go b/test/e2e/common/init_container.go index 9221157a42..db3aee08a8 100644 --- a/test/e2e/common/init_container.go +++ b/test/e2e/common/init_container.go @@ -42,8 +42,6 @@ var _ = framework.KubeDescribe("InitContainer", func() { }) It("should invoke init containers on a RestartNever pod", func() { - framework.SkipIfContainerRuntimeIs("rkt") // #25988 - By("creating the pod") name := "pod-init-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond()) @@ -101,8 +99,6 @@ var _ = framework.KubeDescribe("InitContainer", func() { }) It("should invoke init containers on a RestartAlways pod", func() { - framework.SkipIfContainerRuntimeIs("rkt") // #25988 - By("creating the pod") name := "pod-init-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond()) @@ -164,8 +160,6 @@ var _ = framework.KubeDescribe("InitContainer", func() { }) It("should not start app containers if init containers fail on a RestartAlways pod", func() { - framework.SkipIfContainerRuntimeIs("rkt") // #25988 - By("creating the pod") name := "pod-init-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond()) @@ -274,8 +268,6 @@ var _ = framework.KubeDescribe("InitContainer", func() { }) It("should not start app containers and fail the pod if init containers fail on a RestartNever pod", func() { - framework.SkipIfContainerRuntimeIs("rkt") // #25988 - By("creating the pod") name := "pod-init-" + string(uuid.NewUUID()) value := strconv.Itoa(time.Now().Nanosecond()) diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index e5e1fc93ca..ebb8da41c9 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -209,7 +209,7 @@ func RegisterCommonFlags() { flag.StringVar(&TestContext.ReportDir, "report-dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.") flag.Var(utilflag.NewMapStringBool(&TestContext.FeatureGates), "feature-gates", "A set of key=value pairs that describe feature gates for alpha/experimental features.") flag.StringVar(&TestContext.Viper, "viper-config", "e2e", "The name of the viper config i.e. 'e2e' will read values from 'e2e.json' locally. All e2e parameters are meant to be configurable by viper.") - flag.StringVar(&TestContext.ContainerRuntime, "container-runtime", "docker", "The container runtime of cluster VM instances (docker/rkt/remote).") + flag.StringVar(&TestContext.ContainerRuntime, "container-runtime", "docker", "The container runtime of cluster VM instances (docker/remote).") flag.StringVar(&TestContext.ContainerRuntimeEndpoint, "container-runtime-endpoint", "unix:///var/run/dockershim.sock", "The container runtime endpoint of cluster VM instances.") flag.StringVar(&TestContext.ContainerRuntimeProcessName, "container-runtime-process-name", "dockerd", "The name of the container runtime process.") flag.StringVar(&TestContext.ContainerRuntimePidFile, "container-runtime-pid-file", "/var/run/docker.pid", "The pid file of the container runtime.") @@ -277,7 +277,7 @@ func RegisterNodeFlags() { flag.StringVar(&TestContext.NodeName, "node-name", "", "Name of the node to run tests on.") // TODO(random-liu): Move kubelet start logic out of the test. // TODO(random-liu): Move log fetch logic out of the test. - // There are different ways to start kubelet (systemd, initd, docker, rkt, manually started etc.) + // There are different ways to start kubelet (systemd, initd, docker, manually started etc.) // and manage logs (journald, upstart etc.). // For different situation we need to mount different things into the container, run different commands. // It is hard and unnecessary to deal with the complexity inside the test suite. diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index 7e19567ec9..d30e3f426c 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -505,8 +505,6 @@ var _ = SIGDescribe("Kubectl client", func() { }) It("should support inline execution and attach", func() { - framework.SkipIfContainerRuntimeIs("rkt") // #23335 - nsFlag := fmt.Sprintf("--namespace=%v", ns) By("executing a command with run and attach with stdin") @@ -1537,9 +1535,6 @@ metadata: framework.ConformanceIt("should create a job from an image, then delete the job ", func() { nsFlag := fmt.Sprintf("--namespace=%v", ns) - // The rkt runtime doesn't support attach, see #23335 - framework.SkipIfContainerRuntimeIs("rkt") - By("executing a command with run --rm and attach with stdin") t := time.NewTimer(runJobTimeout) defer t.Stop() diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go index dddd9f7cfa..132919c3c0 100644 --- a/test/e2e_node/cpu_manager_test.go +++ b/test/e2e_node/cpu_manager_test.go @@ -152,9 +152,6 @@ func setOldKubeletConfig(f *framework.Framework, oldCfg *kubeletconfig.KubeletCo } func enableCPUManagerInKubelet(f *framework.Framework) (oldCfg *kubeletconfig.KubeletConfiguration) { - // Run only if the container runtime is not docker or remote (not rkt). - framework.RunIfContainerRuntimeIs("docker", "remote") - // Enable CPU Manager in Kubelet with static policy. oldCfg, err := getCurrentKubeletConfig() framework.ExpectNoError(err) diff --git a/test/test_owners.csv b/test/test_owners.csv index 0d30b8f08b..173b536724 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -663,7 +663,6 @@ k8s.io/kubernetes/pkg/kubelet/pod,alex-mohr,1, k8s.io/kubernetes/pkg/kubelet/prober,alex-mohr,1, k8s.io/kubernetes/pkg/kubelet/prober/results,krousey,1, k8s.io/kubernetes/pkg/kubelet/qos,vishh,0, -k8s.io/kubernetes/pkg/kubelet/rkt,apelisse,1, k8s.io/kubernetes/pkg/kubelet/secret,kevin-wangzefeng,1, k8s.io/kubernetes/pkg/kubelet/server,tallclair,0, k8s.io/kubernetes/pkg/kubelet/server/portforward,rkouj,0,