Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / 506b88652ae57ca4f85a51b9f51641bb50d875af / . / third_party / go / patches / k8s-backport-no-dockershim.patch
blob: 452c7e10f4052f9ccf675459b572e50d4408fa75 [file] [log] [blame]
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]1From bc78dff42ec6be929648e91f3ef2dd6dae5169fb Mon Sep 17 00:00:00 2001
2From: Davanum Srinivas <davanum@gmail.com>
3Date: Tue, 7 Dec 2021 14:48:57 -0500
4Subject: [PATCH] update files to drop dockershim
5
6Signed-off-by: Davanum Srinivas <davanum@gmail.com>
7---
8 build/dependencies.yaml | 2 --
9 cmd/kubelet/app/options/globalflags_linux.go | 11 --------
10 go.mod | 5 ----
11 go.sum | 3 ---
12 pkg/kubelet/kubelet.go | 26 +------------------
13 .../legacy-cloud-providers/aws/aws_fakes.go | 1 +
14 test/e2e/framework/.import-restrictions | 10 -------
15 7 files changed, 2 insertions(+), 56 deletions(-)
16
17diff --git a/build/dependencies.yaml b/build/dependencies.yaml
18index ff296e255b961..b0b1b5a6d41b8 100644
19--- a/build/dependencies.yaml
20+++ b/build/dependencies.yaml
21@@ -172,8 +172,6 @@ dependencies:
22 match: defaultPodSandboxImageVersion\s+=
23 - path: hack/testdata/pod-with-precision.json
24 match: k8s.gcr.io\/pause:\d+\.\d+
25- - path: pkg/kubelet/dockershim/docker_sandbox.go
26- match: k8s.gcr.io\/pause:\d+\.\d+
27 - path: staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
28 match: k8s.gcr.io\/pause:\d+\.\d+
29 - path: staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
30diff --git a/cmd/kubelet/app/options/globalflags_linux.go b/cmd/kubelet/app/options/globalflags_linux.go
31index ad3b68628f661..e75e65ec37cd0 100644
32--- a/cmd/kubelet/app/options/globalflags_linux.go
33+++ b/cmd/kubelet/app/options/globalflags_linux.go
34@@ -28,7 +28,6 @@ import (
35 // ensure libs have a chance to globally register their flags
36 _ "github.com/google/cadvisor/container/common"
37 _ "github.com/google/cadvisor/container/containerd"
38- _ "github.com/google/cadvisor/container/docker"
39 _ "github.com/google/cadvisor/container/raw"
40 _ "github.com/google/cadvisor/machine"
41 _ "github.com/google/cadvisor/manager"
42@@ -41,9 +40,6 @@ func addCadvisorFlags(fs *pflag.FlagSet) {
43 global := flag.CommandLine
44 local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
45
46- // These flags were also implicit from cadvisor, but are actually used by something in the core repo:
47- // TODO(mtaufen): This one is stil used by our salt, but for heaven's sake it's even deprecated in cadvisor
48- register(global, local, "docker_root")
49 // e2e node tests rely on this
50 register(global, local, "housekeeping_interval")
51
52@@ -54,13 +50,6 @@ func addCadvisorFlags(fs *pflag.FlagSet) {
53 registerDeprecated(global, local, "boot_id_file", deprecated)
54 registerDeprecated(global, local, "container_hints", deprecated)
55 registerDeprecated(global, local, "containerd", deprecated)
56- registerDeprecated(global, local, "docker", deprecated)
57- registerDeprecated(global, local, "docker_env_metadata_whitelist", deprecated)
58- registerDeprecated(global, local, "docker_only", deprecated)
59- registerDeprecated(global, local, "docker-tls", deprecated)
60- registerDeprecated(global, local, "docker-tls-ca", deprecated)
61- registerDeprecated(global, local, "docker-tls-cert", deprecated)
62- registerDeprecated(global, local, "docker-tls-key", deprecated)
63 registerDeprecated(global, local, "enable_load_reader", deprecated)
64 registerDeprecated(global, local, "event_storage_age_limit", deprecated)
65 registerDeprecated(global, local, "event_storage_event_limit", deprecated)
66diff --git a/go.mod b/go.mod
67index a17878d68d030..7dccd35bb6b91 100644
68--- a/go.mod
69+++ b/go.mod
70@@ -25,15 +25,12 @@ require (
71 github.com/boltdb/bolt v1.3.1 // indirect
72 github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313
73 github.com/container-storage-interface/spec v1.5.0
74- github.com/containernetworking/cni v0.8.1
75 github.com/coredns/corefile-migration v1.0.14
76 github.com/coreos/go-oidc v2.1.0+incompatible
77 github.com/coreos/go-systemd/v22 v22.3.2
78 github.com/cpuguy83/go-md2man/v2 v2.0.0
79 github.com/davecgh/go-spew v1.1.1
80 github.com/docker/distribution v2.7.1+incompatible
81- github.com/docker/docker v20.10.7+incompatible
82- github.com/docker/go-connections v0.4.0
83 github.com/docker/go-units v0.4.0
84 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153
85 github.com/emicklei/go-restful v2.9.5+incompatible
86@@ -63,7 +60,6 @@ require (
87 github.com/mvdan/xurls v1.1.0
88 github.com/onsi/ginkgo v1.14.0
89 github.com/onsi/gomega v1.10.1
90- github.com/opencontainers/go-digest v1.0.0
91 github.com/opencontainers/runc v1.0.2
92 github.com/opencontainers/selinux v1.8.2
93 github.com/pkg/errors v0.9.1
94@@ -209,7 +205,6 @@ replace (
95 github.com/containerd/go-runc => github.com/containerd/go-runc v1.0.0
96 github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
97 github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.2
98- github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1
99 github.com/coredns/caddy => github.com/coredns/caddy v1.1.0
100 github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.14
101 github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
102diff --git a/go.sum b/go.sum
103index b458fb06802b3..9121b2f4ac81a 100644
104--- a/go.sum
105+++ b/go.sum
106@@ -116,8 +116,6 @@ github.com/containerd/ttrpc v1.0.2 h1:2/O3oTZN36q2xRolk0a2WWGgh7/Vf/liElg5hFYLX9
107 github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
108 github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=
109 github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
110-github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI=
111-github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
112 github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
113 github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
114 github.com/coredns/corefile-migration v1.0.14 h1:Tz3WZhoj2NdP8drrQH86NgnCng+VrPjNeg2Oe1ALKag=
115@@ -353,7 +351,6 @@ github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb h1:e+l77LJOEqXTIQih
116 github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
117 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
118 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
119-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
120 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
121 github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4=
122 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
123diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
124index 2013c871a608a..0e6f5f946dea0 100644
125--- a/pkg/kubelet/kubelet.go
126+++ b/pkg/kubelet/kubelet.go
127@@ -73,7 +73,6 @@ import (
128 "k8s.io/kubernetes/pkg/kubelet/configmap"
129 kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
130 "k8s.io/kubernetes/pkg/kubelet/cri/remote"
131- "k8s.io/kubernetes/pkg/kubelet/cri/streaming"
132 "k8s.io/kubernetes/pkg/kubelet/events"
133 "k8s.io/kubernetes/pkg/kubelet/eviction"
134 "k8s.io/kubernetes/pkg/kubelet/images"
135@@ -310,18 +309,7 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
136
137 switch containerRuntime {
138 case kubetypes.DockerContainerRuntime:
139- klog.InfoS("Using dockershim is deprecated, please consider using a full-fledged CRI implementation")
140- if err := runDockershim(
141- kubeCfg,
142- kubeDeps,
143- crOptions,
144- runtimeCgroups,
145- remoteRuntimeEndpoint,
146- remoteImageEndpoint,
147- nonMasqueradeCIDR,
148- ); err != nil {
149- return err
150- }
151+ return fmt.Errorf("using dockershim is not supported, please consider using a full-fledged CRI implementation")
152 case kubetypes.RemoteContainerRuntime:
153 // No-op.
154 break
155@@ -2440,15 +2428,3 @@ func isSyncPodWorthy(event *pleg.PodLifecycleEvent) bool {
156 // ContainerRemoved doesn't affect pod state
157 return event.Type != pleg.ContainerRemoved
158 }
159-
160-// Gets the streaming server configuration to use with in-process CRI shims.
161-func getStreamingConfig(kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps *Dependencies, crOptions *config.ContainerRuntimeOptions) *streaming.Config {
162- config := &streaming.Config{
163- StreamIdleTimeout: kubeCfg.StreamingConnectionIdleTimeout.Duration,
164- StreamCreationTimeout: streaming.DefaultConfig.StreamCreationTimeout,
165- SupportedRemoteCommandProtocols: streaming.DefaultConfig.SupportedRemoteCommandProtocols,
166- SupportedPortForwardProtocols: streaming.DefaultConfig.SupportedPortForwardProtocols,
167- }
168- config.Addr = net.JoinHostPort("localhost", "0")
169- return config
170-}
171diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions
172index a60fb9d790847..1353f40df9ddf 100644
173--- a/test/e2e/framework/.import-restrictions
174+++ b/test/e2e/framework/.import-restrictions
175@@ -86,16 +86,6 @@ rules:
176 - k8s.io/kubernetes/pkg/kubelet/config
177 - k8s.io/kubernetes/pkg/kubelet/configmap
178 - k8s.io/kubernetes/pkg/kubelet/container
179- - k8s.io/kubernetes/pkg/kubelet/dockershim
180- - k8s.io/kubernetes/pkg/kubelet/dockershim/cm
181- - k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker
182- - k8s.io/kubernetes/pkg/kubelet/dockershim/metrics
183- - k8s.io/kubernetes/pkg/kubelet/dockershim/network
184- - k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni
185- - k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport
186- - k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet
187- - k8s.io/kubernetes/pkg/kubelet/dockershim/network/metrics
188- - k8s.io/kubernetes/pkg/kubelet/dockershim/remote
189 - k8s.io/kubernetes/pkg/kubelet/envvars
190 - k8s.io/kubernetes/pkg/kubelet/eviction
191 - k8s.io/kubernetes/pkg/kubelet/eviction/api