From aa8c72adaaab6cba51ff868516ac5b423a95f069 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Sun, 8 May 2016 15:26:37 -0700 Subject: [PATCH] seccomp: add annotations and test for docker runtime Signed-off-by: Jess Frazelle --- cmd/kubelet/app/options/options.go | 3 + cmd/kubelet/app/server.go | 3 + docs/admin/kubelet.md | 3 +- hack/verify-flags/known-flags.txt | 1 + .../componentconfig/deep_copy_generated.go | 1 + pkg/apis/componentconfig/types.generated.go | 2047 +++++++++-------- pkg/apis/componentconfig/types.go | 2 + pkg/kubelet/dockertools/fake_manager.go | 2 +- pkg/kubelet/dockertools/manager.go | 57 +- pkg/kubelet/dockertools/manager_test.go | 131 +- pkg/kubelet/kubelet.go | 2 + test/e2e_node/image.go | 2 +- 12 files changed, 1239 insertions(+), 1015 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 31a681f4df..76a167b13d 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -19,6 +19,7 @@ package options import ( _ "net/http/pprof" + "path/filepath" "runtime" "time" @@ -132,6 +133,7 @@ func NewKubeletServer() *KubeletServer { RootDirectory: defaultRootDir, RuntimeCgroups: "", SerializeImagePulls: true, + SeccompProfileRoot: filepath.Join(defaultRootDir, "seccomp"), StreamingConnectionIdleTimeout: unversioned.Duration{Duration: 4 * time.Hour}, SyncFrequency: unversioned.Duration{Duration: 1 * time.Minute}, SystemCgroups: "", @@ -171,6 +173,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.PodInfraContainerImage, "pod-infra-container-image", s.PodInfraContainerImage, "The image whose network/ipc namespaces containers in each pod will use.") fs.StringVar(&s.DockerEndpoint, "docker-endpoint", s.DockerEndpoint, "If non-empty, use this for the docker endpoint to communicate with") fs.StringVar(&s.RootDirectory, "root-dir", s.RootDirectory, "Directory path for managing kubelet files (volume mounts,etc).") + fs.StringVar(&s.SeccompProfileRoot, "seccomp-profile-root", s.SeccompProfileRoot, "Directory path for seccomp profiles.") fs.BoolVar(&s.AllowPrivileged, "allow-privileged", s.AllowPrivileged, "If true, allow containers to request privileged mode. [default=false]") fs.StringVar(&s.HostNetworkSources, "host-network-sources", s.HostNetworkSources, "Comma-separated list of sources from which the Kubelet allows pods to use of host network. [default=\"*\"]") fs.StringVar(&s.HostPIDSources, "host-pid-sources", s.HostPIDSources, "Comma-separated list of sources from which the Kubelet allows pods to use the host pid namespace. [default=\"*\"]") diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 6e852cd5ae..1c6de858a5 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -260,6 +260,7 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) { RktAPIEndpoint: s.RktAPIEndpoint, RktStage1Image: s.RktStage1Image, RootDirectory: s.RootDirectory, + SeccompProfileRoot: s.SeccompProfileRoot, Runonce: s.RunOnce, SerializeImagePulls: s.SerializeImagePulls, StandaloneMode: (len(s.APIServerList) == 0), @@ -794,6 +795,7 @@ type KubeletConfig struct { RktStage1Image string RootDirectory string Runonce bool + SeccompProfileRoot string SerializeImagePulls bool StandaloneMode bool StreamingConnectionIdleTimeout time.Duration @@ -845,6 +847,7 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod kc.DockerClient, kubeClient, kc.RootDirectory, + kc.SeccompProfileRoot, kc.PodInfraContainerImage, kc.SyncFrequency, float32(kc.RegistryPullQPS), diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md index 5e95cc36d2..307b27ca0a 100644 --- a/docs/admin/kubelet.md +++ b/docs/admin/kubelet.md @@ -149,6 +149,7 @@ kubelet --root-dir="/var/lib/kubelet": Directory path for managing kubelet files (volume mounts,etc). --runonce[=false]: If true, exit after spawning pods from local manifests or remote urls. Exclusive with --api-servers, and --enable-server --runtime-cgroups="": Optional absolute name of cgroups to create and run the runtime in. + --seccomp-profile-root="/var/lib/kubelet/seccomp": Directory path for seccomp profiles. --serialize-image-pulls[=true]: Pull images one at a time. We recommend *not* changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. Issue #10959 has more details. [default=true] --streaming-connection-idle-timeout=4h0m0s: Maximum time a streaming connection can be idle before the connection is automatically closed. 0 indicates no timeout. Example: '5m' --sync-frequency=1m0s: Max period between synchronizing running containers and config @@ -160,7 +161,7 @@ kubelet --volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to 0. Default: '1m' ``` -###### Auto generated by spf13/cobra on 21-May-2016 +###### Auto generated by spf13/cobra on 24-May-2016 diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 633f20a86e..083aae2742 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -379,6 +379,7 @@ save-config scheduler-config scheduler-name schema-cache-dir +seccomp-profile-root secure-port serialize-image-pulls server-start-timeout diff --git a/pkg/apis/componentconfig/deep_copy_generated.go b/pkg/apis/componentconfig/deep_copy_generated.go index e36fb927aa..de9a0624b9 100644 --- a/pkg/apis/componentconfig/deep_copy_generated.go +++ b/pkg/apis/componentconfig/deep_copy_generated.go @@ -223,6 +223,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in KubeletConfiguration, out out.PodInfraContainerImage = in.PodInfraContainerImage out.DockerEndpoint = in.DockerEndpoint out.RootDirectory = in.RootDirectory + out.SeccompProfileRoot = in.SeccompProfileRoot out.AllowPrivileged = in.AllowPrivileged out.HostNetworkSources = in.HostNetworkSources out.HostPIDSources = in.HostPIDSources diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index 1881035188..7ac45eccbb 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -1175,30 +1175,30 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [87]bool + var yyq2 [88]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false - yyq2[47] = x.CloudProvider != "" - yyq2[48] = x.CloudConfigFile != "" - yyq2[49] = x.KubeletCgroups != "" - yyq2[50] = x.RuntimeCgroups != "" - yyq2[51] = x.SystemCgroups != "" - yyq2[52] = x.CgroupRoot != "" - yyq2[54] = x.RktPath != "" - yyq2[55] = x.RktAPIEndpoint != "" - yyq2[56] = x.RktStage1Image != "" - yyq2[77] = true - yyq2[78] = x.NodeIP != "" - yyq2[82] = x.EvictionHard != "" - yyq2[83] = x.EvictionSoft != "" - yyq2[84] = x.EvictionSoftGracePeriod != "" - yyq2[85] = true - yyq2[86] = x.EvictionMaxPodGracePeriod != 0 + yyq2[48] = x.CloudProvider != "" + yyq2[49] = x.CloudConfigFile != "" + yyq2[50] = x.KubeletCgroups != "" + yyq2[51] = x.RuntimeCgroups != "" + yyq2[52] = x.SystemCgroups != "" + yyq2[53] = x.CgroupRoot != "" + yyq2[55] = x.RktPath != "" + yyq2[56] = x.RktAPIEndpoint != "" + yyq2[57] = x.RktStage1Image != "" + yyq2[78] = true + yyq2[79] = x.NodeIP != "" + yyq2[83] = x.EvictionHard != "" + yyq2[84] = x.EvictionSoft != "" + yyq2[85] = x.EvictionSoftGracePeriod != "" + yyq2[86] = true + yyq2[87] = x.EvictionMaxPodGracePeriod != 0 var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(87) + r.EncodeArrayStart(88) } else { - yynn2 = 71 + yynn2 = 72 for _, b := range yyq2 { if b { yynn2++ @@ -1560,17 +1560,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym61 if false { } else { - r.EncodeBool(bool(x.AllowPrivileged)) + r.EncodeString(codecSelferC_UTF81234, string(x.SeccompProfileRoot)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("allowPrivileged")) + r.EncodeString(codecSelferC_UTF81234, string("seccompProfileRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym62 := z.EncBinary() _ = yym62 if false { } else { - r.EncodeBool(bool(x.AllowPrivileged)) + r.EncodeString(codecSelferC_UTF81234, string(x.SeccompProfileRoot)) } } if yyr2 || yy2arr2 { @@ -1579,17 +1579,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym64 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) + r.EncodeBool(bool(x.AllowPrivileged)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hostNetworkSources")) + r.EncodeString(codecSelferC_UTF81234, string("allowPrivileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym65 := z.EncBinary() _ = yym65 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) + r.EncodeBool(bool(x.AllowPrivileged)) } } if yyr2 || yy2arr2 { @@ -1598,17 +1598,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym67 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hostPIDSources")) + r.EncodeString(codecSelferC_UTF81234, string("hostNetworkSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym68 := z.EncBinary() _ = yym68 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) } } if yyr2 || yy2arr2 { @@ -1617,17 +1617,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym70 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hostIPCSources")) + r.EncodeString(codecSelferC_UTF81234, string("hostPIDSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym71 := z.EncBinary() _ = yym71 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) } } if yyr2 || yy2arr2 { @@ -1636,17 +1636,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym73 if false { } else { - r.EncodeFloat64(float64(x.RegistryPullQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("registryPullQPS")) + r.EncodeString(codecSelferC_UTF81234, string("hostIPCSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym74 := z.EncBinary() _ = yym74 if false { } else { - r.EncodeFloat64(float64(x.RegistryPullQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) } } if yyr2 || yy2arr2 { @@ -1655,17 +1655,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym76 if false { } else { - r.EncodeInt(int64(x.RegistryBurst)) + r.EncodeFloat64(float64(x.RegistryPullQPS)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("registryBurst")) + r.EncodeString(codecSelferC_UTF81234, string("registryPullQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym77 := z.EncBinary() _ = yym77 if false { } else { - r.EncodeInt(int64(x.RegistryBurst)) + r.EncodeFloat64(float64(x.RegistryPullQPS)) } } if yyr2 || yy2arr2 { @@ -1674,17 +1674,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym79 if false { } else { - r.EncodeFloat32(float32(x.EventRecordQPS)) + r.EncodeInt(int64(x.RegistryBurst)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("eventRecordQPS")) + r.EncodeString(codecSelferC_UTF81234, string("registryBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym80 := z.EncBinary() _ = yym80 if false { } else { - r.EncodeFloat32(float32(x.EventRecordQPS)) + r.EncodeInt(int64(x.RegistryBurst)) } } if yyr2 || yy2arr2 { @@ -1693,17 +1693,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym82 if false { } else { - r.EncodeInt(int64(x.EventBurst)) + r.EncodeFloat32(float32(x.EventRecordQPS)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("eventBurst")) + r.EncodeString(codecSelferC_UTF81234, string("eventRecordQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym83 := z.EncBinary() _ = yym83 if false { } else { - r.EncodeInt(int64(x.EventBurst)) + r.EncodeFloat32(float32(x.EventRecordQPS)) } } if yyr2 || yy2arr2 { @@ -1711,6 +1711,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym85 := z.EncBinary() _ = yym85 if false { + } else { + r.EncodeInt(int64(x.EventBurst)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("eventBurst")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym86 := z.EncBinary() + _ = yym86 + if false { + } else { + r.EncodeInt(int64(x.EventBurst)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym88 := z.EncBinary() + _ = yym88 + if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) } @@ -1718,8 +1737,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDebuggingHandlers")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym86 := z.EncBinary() - _ = yym86 + yym89 := z.EncBinary() + _ = yym89 if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) @@ -1727,48 +1746,29 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy88 := &x.MinimumGCAge - yym89 := z.EncBinary() - _ = yym89 + yy91 := &x.MinimumGCAge + yym92 := z.EncBinary() + _ = yym92 if false { - } else if z.HasExtensions() && z.EncExt(yy88) { - } else if !yym89 && z.IsJSONHandle() { - z.EncJSONMarshal(yy88) + } else if z.HasExtensions() && z.EncExt(yy91) { + } else if !yym92 && z.IsJSONHandle() { + z.EncJSONMarshal(yy91) } else { - z.EncFallback(yy88) + z.EncFallback(yy91) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumGCAge")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy90 := &x.MinimumGCAge - yym91 := z.EncBinary() - _ = yym91 - if false { - } else if z.HasExtensions() && z.EncExt(yy90) { - } else if !yym91 && z.IsJSONHandle() { - z.EncJSONMarshal(yy90) - } else { - z.EncFallback(yy90) - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym93 := z.EncBinary() - _ = yym93 - if false { - } else { - r.EncodeInt(int64(x.MaxPerPodContainerCount)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxPerPodContainerCount")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy93 := &x.MinimumGCAge yym94 := z.EncBinary() _ = yym94 if false { + } else if z.HasExtensions() && z.EncExt(yy93) { + } else if !yym94 && z.IsJSONHandle() { + z.EncJSONMarshal(yy93) } else { - r.EncodeInt(int64(x.MaxPerPodContainerCount)) + z.EncFallback(yy93) } } if yyr2 || yy2arr2 { @@ -1777,17 +1777,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym96 if false { } else { - r.EncodeInt(int64(x.MaxContainerCount)) + r.EncodeInt(int64(x.MaxPerPodContainerCount)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxContainerCount")) + r.EncodeString(codecSelferC_UTF81234, string("maxPerPodContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym97 := z.EncBinary() _ = yym97 if false { } else { - r.EncodeInt(int64(x.MaxContainerCount)) + r.EncodeInt(int64(x.MaxPerPodContainerCount)) } } if yyr2 || yy2arr2 { @@ -1796,17 +1796,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym99 if false { } else { - r.EncodeUint(uint64(x.CAdvisorPort)) + r.EncodeInt(int64(x.MaxContainerCount)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cAdvisorPort")) + r.EncodeString(codecSelferC_UTF81234, string("maxContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym100 := z.EncBinary() _ = yym100 if false { } else { - r.EncodeUint(uint64(x.CAdvisorPort)) + r.EncodeInt(int64(x.MaxContainerCount)) } } if yyr2 || yy2arr2 { @@ -1815,17 +1815,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym102 if false { } else { - r.EncodeInt(int64(x.HealthzPort)) + r.EncodeUint(uint64(x.CAdvisorPort)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("healthzPort")) + r.EncodeString(codecSelferC_UTF81234, string("cAdvisorPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym103 := z.EncBinary() _ = yym103 if false { } else { - r.EncodeInt(int64(x.HealthzPort)) + r.EncodeUint(uint64(x.CAdvisorPort)) } } if yyr2 || yy2arr2 { @@ -1834,17 +1834,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym105 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) + r.EncodeInt(int64(x.HealthzPort)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("healthzBindAddress")) + r.EncodeString(codecSelferC_UTF81234, string("healthzPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym106 := z.EncBinary() _ = yym106 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) + r.EncodeInt(int64(x.HealthzPort)) } } if yyr2 || yy2arr2 { @@ -1853,17 +1853,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym108 if false { } else { - r.EncodeInt(int64(x.OOMScoreAdj)) + r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("oomScoreAdj")) + r.EncodeString(codecSelferC_UTF81234, string("healthzBindAddress")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym109 := z.EncBinary() _ = yym109 if false { } else { - r.EncodeInt(int64(x.OOMScoreAdj)) + r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) } } if yyr2 || yy2arr2 { @@ -1872,17 +1872,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym111 if false { } else { - r.EncodeBool(bool(x.RegisterNode)) + r.EncodeInt(int64(x.OOMScoreAdj)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("registerNode")) + r.EncodeString(codecSelferC_UTF81234, string("oomScoreAdj")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym112 := z.EncBinary() _ = yym112 if false { } else { - r.EncodeBool(bool(x.RegisterNode)) + r.EncodeInt(int64(x.OOMScoreAdj)) } } if yyr2 || yy2arr2 { @@ -1891,17 +1891,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym114 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) + r.EncodeBool(bool(x.RegisterNode)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("clusterDomain")) + r.EncodeString(codecSelferC_UTF81234, string("registerNode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym115 := z.EncBinary() _ = yym115 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) + r.EncodeBool(bool(x.RegisterNode)) } } if yyr2 || yy2arr2 { @@ -1910,17 +1910,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym117 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) + r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("masterServiceNamespace")) + r.EncodeString(codecSelferC_UTF81234, string("clusterDomain")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym118 := z.EncBinary() _ = yym118 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) + r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) } } if yyr2 || yy2arr2 { @@ -1928,6 +1928,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym120 := z.EncBinary() _ = yym120 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("masterServiceNamespace")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym121 := z.EncBinary() + _ = yym121 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym123 := z.EncBinary() + _ = yym123 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) } @@ -1935,8 +1954,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterDNS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym121 := z.EncBinary() - _ = yym121 + yym124 := z.EncBinary() + _ = yym124 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) @@ -1944,34 +1963,21 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy123 := &x.StreamingConnectionIdleTimeout - yym124 := z.EncBinary() - _ = yym124 + yy126 := &x.StreamingConnectionIdleTimeout + yym127 := z.EncBinary() + _ = yym127 if false { - } else if z.HasExtensions() && z.EncExt(yy123) { - } else if !yym124 && z.IsJSONHandle() { - z.EncJSONMarshal(yy123) + } else if z.HasExtensions() && z.EncExt(yy126) { + } else if !yym127 && z.IsJSONHandle() { + z.EncJSONMarshal(yy126) } else { - z.EncFallback(yy123) + z.EncFallback(yy126) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("streamingConnectionIdleTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy125 := &x.StreamingConnectionIdleTimeout - yym126 := z.EncBinary() - _ = yym126 - if false { - } else if z.HasExtensions() && z.EncExt(yy125) { - } else if !yym126 && z.IsJSONHandle() { - z.EncJSONMarshal(yy125) - } else { - z.EncFallback(yy125) - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy128 := &x.NodeStatusUpdateFrequency + yy128 := &x.StreamingConnectionIdleTimeout yym129 := z.EncBinary() _ = yym129 if false { @@ -1981,24 +1987,24 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { z.EncFallback(yy128) } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy131 := &x.NodeStatusUpdateFrequency + yym132 := z.EncBinary() + _ = yym132 + if false { + } else if z.HasExtensions() && z.EncExt(yy131) { + } else if !yym132 && z.IsJSONHandle() { + z.EncJSONMarshal(yy131) + } else { + z.EncFallback(yy131) + } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeStatusUpdateFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy130 := &x.NodeStatusUpdateFrequency - yym131 := z.EncBinary() - _ = yym131 - if false { - } else if z.HasExtensions() && z.EncExt(yy130) { - } else if !yym131 && z.IsJSONHandle() { - z.EncJSONMarshal(yy130) - } else { - z.EncFallback(yy130) - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy133 := &x.ImageMinimumGCAge + yy133 := &x.NodeStatusUpdateFrequency yym134 := z.EncBinary() _ = yym134 if false { @@ -2008,38 +2014,32 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { z.EncFallback(yy133) } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy136 := &x.ImageMinimumGCAge + yym137 := z.EncBinary() + _ = yym137 + if false { + } else if z.HasExtensions() && z.EncExt(yy136) { + } else if !yym137 && z.IsJSONHandle() { + z.EncJSONMarshal(yy136) + } else { + z.EncFallback(yy136) + } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageMinimumGCAge")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy135 := &x.ImageMinimumGCAge - yym136 := z.EncBinary() - _ = yym136 - if false { - } else if z.HasExtensions() && z.EncExt(yy135) { - } else if !yym136 && z.IsJSONHandle() { - z.EncJSONMarshal(yy135) - } else { - z.EncFallback(yy135) - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym138 := z.EncBinary() - _ = yym138 - if false { - } else { - r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("imageGCHighThresholdPercent")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy138 := &x.ImageMinimumGCAge yym139 := z.EncBinary() _ = yym139 if false { + } else if z.HasExtensions() && z.EncExt(yy138) { + } else if !yym139 && z.IsJSONHandle() { + z.EncJSONMarshal(yy138) } else { - r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) + z.EncFallback(yy138) } } if yyr2 || yy2arr2 { @@ -2048,17 +2048,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym141 if false { } else { - r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) + r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("imageGCLowThresholdPercent")) + r.EncodeString(codecSelferC_UTF81234, string("imageGCHighThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym142 := z.EncBinary() _ = yym142 if false { } else { - r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) + r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) } } if yyr2 || yy2arr2 { @@ -2066,6 +2066,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym144 := z.EncBinary() _ = yym144 if false { + } else { + r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("imageGCLowThresholdPercent")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym145 := z.EncBinary() + _ = yym145 + if false { + } else { + r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym147 := z.EncBinary() + _ = yym147 + if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) } @@ -2073,8 +2092,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lowDiskSpaceThresholdMB")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym145 := z.EncBinary() - _ = yym145 + yym148 := z.EncBinary() + _ = yym148 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) @@ -2082,48 +2101,29 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy147 := &x.VolumeStatsAggPeriod - yym148 := z.EncBinary() - _ = yym148 + yy150 := &x.VolumeStatsAggPeriod + yym151 := z.EncBinary() + _ = yym151 if false { - } else if z.HasExtensions() && z.EncExt(yy147) { - } else if !yym148 && z.IsJSONHandle() { - z.EncJSONMarshal(yy147) + } else if z.HasExtensions() && z.EncExt(yy150) { + } else if !yym151 && z.IsJSONHandle() { + z.EncJSONMarshal(yy150) } else { - z.EncFallback(yy147) + z.EncFallback(yy150) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeStatsAggPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy149 := &x.VolumeStatsAggPeriod - yym150 := z.EncBinary() - _ = yym150 - if false { - } else if z.HasExtensions() && z.EncExt(yy149) { - } else if !yym150 && z.IsJSONHandle() { - z.EncJSONMarshal(yy149) - } else { - z.EncFallback(yy149) - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym152 := z.EncBinary() - _ = yym152 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("networkPluginName")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy152 := &x.VolumeStatsAggPeriod yym153 := z.EncBinary() _ = yym153 if false { + } else if z.HasExtensions() && z.EncExt(yy152) { + } else if !yym153 && z.IsJSONHandle() { + z.EncJSONMarshal(yy152) } else { - r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) + z.EncFallback(yy152) } } if yyr2 || yy2arr2 { @@ -2132,17 +2132,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym155 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) + r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("networkPluginDir")) + r.EncodeString(codecSelferC_UTF81234, string("networkPluginName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym156 := z.EncBinary() _ = yym156 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) + r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) } } if yyr2 || yy2arr2 { @@ -2150,6 +2150,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym158 := z.EncBinary() _ = yym158 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("networkPluginDir")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym159 := z.EncBinary() + _ = yym159 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym161 := z.EncBinary() + _ = yym161 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) } @@ -2157,38 +2176,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym159 := z.EncBinary() - _ = yym159 + yym162 := z.EncBinary() + _ = yym162 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) } } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[47] { - yym161 := z.EncBinary() - _ = yym161 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq2[47] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym162 := z.EncBinary() - _ = yym162 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } - } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq2[48] { @@ -2196,7 +2190,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym164 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2204,13 +2198,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[48] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) + r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym165 := z.EncBinary() _ = yym165 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } } @@ -2221,7 +2215,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym167 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2229,13 +2223,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[49] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeletCgroups")) + r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym168 := z.EncBinary() _ = yym168 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } } @@ -2246,7 +2240,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym170 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2254,13 +2248,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[50] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("runtimeCgroups")) + r.EncodeString(codecSelferC_UTF81234, string("kubeletCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym171 := z.EncBinary() _ = yym171 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) } } } @@ -2271,7 +2265,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym173 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2279,13 +2273,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[51] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("systemContainer")) + r.EncodeString(codecSelferC_UTF81234, string("runtimeCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym174 := z.EncBinary() _ = yym174 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) } } } @@ -2296,7 +2290,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym176 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2304,11 +2298,36 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[52] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) + r.EncodeString(codecSelferC_UTF81234, string("systemContainer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym177 := z.EncBinary() _ = yym177 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[53] { + yym179 := z.EncBinary() + _ = yym179 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2[53] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym180 := z.EncBinary() + _ = yym180 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) } @@ -2316,8 +2335,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym179 := z.EncBinary() - _ = yym179 + yym182 := z.EncBinary() + _ = yym182 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) @@ -2326,38 +2345,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerRuntime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym180 := z.EncBinary() - _ = yym180 + yym183 := z.EncBinary() + _ = yym183 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) } } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[54] { - yym182 := z.EncBinary() - _ = yym182 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq2[54] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("rktPath")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym183 := z.EncBinary() - _ = yym183 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) - } - } - } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq2[55] { @@ -2365,7 +2359,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym185 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) + r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2373,13 +2367,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[55] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("rktAPIEndpoint")) + r.EncodeString(codecSelferC_UTF81234, string("rktPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym186 := z.EncBinary() _ = yym186 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) + r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) } } } @@ -2390,7 +2384,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym188 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) + r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2398,33 +2392,39 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[56] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("rktStage1Image")) + r.EncodeString(codecSelferC_UTF81234, string("rktAPIEndpoint")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym189 := z.EncBinary() _ = yym189 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) + r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym191 := z.EncBinary() - _ = yym191 - if false { + if yyq2[57] { + yym191 := z.EncBinary() + _ = yym191 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) + } } else { - r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) + r.EncodeString(codecSelferC_UTF81234, "") } } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("lockFilePath")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym192 := z.EncBinary() - _ = yym192 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) + if yyq2[57] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("rktStage1Image")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym192 := z.EncBinary() + _ = yym192 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) + } } } if yyr2 || yy2arr2 { @@ -2433,17 +2433,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym194 if false { } else { - r.EncodeBool(bool(x.ExitOnLockContention)) + r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("exitOnLockContention")) + r.EncodeString(codecSelferC_UTF81234, string("lockFilePath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym195 := z.EncBinary() _ = yym195 if false { } else { - r.EncodeBool(bool(x.ExitOnLockContention)) + r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) } } if yyr2 || yy2arr2 { @@ -2452,17 +2452,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym197 if false { } else { - r.EncodeBool(bool(x.ConfigureCBR0)) + r.EncodeBool(bool(x.ExitOnLockContention)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) + r.EncodeString(codecSelferC_UTF81234, string("exitOnLockContention")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym198 := z.EncBinary() _ = yym198 if false { } else { - r.EncodeBool(bool(x.ConfigureCBR0)) + r.EncodeBool(bool(x.ExitOnLockContention)) } } if yyr2 || yy2arr2 { @@ -2471,17 +2471,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym200 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) + r.EncodeBool(bool(x.ConfigureCBR0)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hairpinMode")) + r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym201 := z.EncBinary() _ = yym201 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) + r.EncodeBool(bool(x.ConfigureCBR0)) } } if yyr2 || yy2arr2 { @@ -2490,17 +2490,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym203 if false { } else { - r.EncodeBool(bool(x.BabysitDaemons)) + r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("babysitDaemons")) + r.EncodeString(codecSelferC_UTF81234, string("hairpinMode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym204 := z.EncBinary() _ = yym204 if false { } else { - r.EncodeBool(bool(x.BabysitDaemons)) + r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) } } if yyr2 || yy2arr2 { @@ -2509,17 +2509,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym206 if false { } else { - r.EncodeInt(int64(x.MaxPods)) + r.EncodeBool(bool(x.BabysitDaemons)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxPods")) + r.EncodeString(codecSelferC_UTF81234, string("babysitDaemons")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym207 := z.EncBinary() _ = yym207 if false { } else { - r.EncodeInt(int64(x.MaxPods)) + r.EncodeBool(bool(x.BabysitDaemons)) } } if yyr2 || yy2arr2 { @@ -2528,17 +2528,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym209 if false { } else { - r.EncodeInt(int64(x.NvidiaGPUs)) + r.EncodeInt(int64(x.MaxPods)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nvidiaGPUs")) + r.EncodeString(codecSelferC_UTF81234, string("maxPods")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym210 := z.EncBinary() _ = yym210 if false { } else { - r.EncodeInt(int64(x.NvidiaGPUs)) + r.EncodeInt(int64(x.MaxPods)) } } if yyr2 || yy2arr2 { @@ -2547,17 +2547,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym212 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) + r.EncodeInt(int64(x.NvidiaGPUs)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) + r.EncodeString(codecSelferC_UTF81234, string("nvidiaGPUs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym213 := z.EncBinary() _ = yym213 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) + r.EncodeInt(int64(x.NvidiaGPUs)) } } if yyr2 || yy2arr2 { @@ -2566,17 +2566,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym215 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) + r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) + r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym216 := z.EncBinary() _ = yym216 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) + r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } if yyr2 || yy2arr2 { @@ -2585,17 +2585,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym218 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) + r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym219 := z.EncBinary() _ = yym219 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } if yyr2 || yy2arr2 { @@ -2604,17 +2604,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym221 if false { } else { - r.EncodeBool(bool(x.CPUCFSQuota)) + r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) + r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym222 := z.EncBinary() _ = yym222 if false { } else { - r.EncodeBool(bool(x.CPUCFSQuota)) + r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } if yyr2 || yy2arr2 { @@ -2623,17 +2623,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym224 if false { } else { - r.EncodeBool(bool(x.Containerized)) + r.EncodeBool(bool(x.CPUCFSQuota)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("containerized")) + r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym225 := z.EncBinary() _ = yym225 if false { } else { - r.EncodeBool(bool(x.Containerized)) + r.EncodeBool(bool(x.CPUCFSQuota)) } } if yyr2 || yy2arr2 { @@ -2642,17 +2642,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym227 if false { } else { - r.EncodeUint(uint64(x.MaxOpenFiles)) + r.EncodeBool(bool(x.Containerized)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) + r.EncodeString(codecSelferC_UTF81234, string("containerized")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym228 := z.EncBinary() _ = yym228 if false { } else { - r.EncodeUint(uint64(x.MaxOpenFiles)) + r.EncodeBool(bool(x.Containerized)) } } if yyr2 || yy2arr2 { @@ -2661,17 +2661,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym230 if false { } else { - r.EncodeBool(bool(x.ReconcileCIDR)) + r.EncodeUint(uint64(x.MaxOpenFiles)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) + r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym231 := z.EncBinary() _ = yym231 if false { } else { - r.EncodeBool(bool(x.ReconcileCIDR)) + r.EncodeUint(uint64(x.MaxOpenFiles)) } } if yyr2 || yy2arr2 { @@ -2680,17 +2680,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym233 if false { } else { - r.EncodeBool(bool(x.RegisterSchedulable)) + r.EncodeBool(bool(x.ReconcileCIDR)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) + r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym234 := z.EncBinary() _ = yym234 if false { } else { - r.EncodeBool(bool(x.RegisterSchedulable)) + r.EncodeBool(bool(x.ReconcileCIDR)) } } if yyr2 || yy2arr2 { @@ -2699,17 +2699,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym236 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeBool(bool(x.RegisterSchedulable)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("contentType")) + r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym237 := z.EncBinary() _ = yym237 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeBool(bool(x.RegisterSchedulable)) } } if yyr2 || yy2arr2 { @@ -2718,17 +2718,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym239 if false { } else { - r.EncodeFloat32(float32(x.KubeAPIQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) + r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym240 := z.EncBinary() _ = yym240 if false { } else { - r.EncodeFloat32(float32(x.KubeAPIQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } if yyr2 || yy2arr2 { @@ -2737,17 +2737,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym242 if false { } else { - r.EncodeInt(int64(x.KubeAPIBurst)) + r.EncodeFloat32(float32(x.KubeAPIQPS)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym243 := z.EncBinary() _ = yym243 if false { } else { - r.EncodeInt(int64(x.KubeAPIBurst)) + r.EncodeFloat32(float32(x.KubeAPIQPS)) } } if yyr2 || yy2arr2 { @@ -2756,17 +2756,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym245 if false { } else { - r.EncodeBool(bool(x.SerializeImagePulls)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym246 := z.EncBinary() _ = yym246 if false { } else { - r.EncodeBool(bool(x.SerializeImagePulls)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } if yyr2 || yy2arr2 { @@ -2774,6 +2774,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym248 := z.EncBinary() _ = yym248 if false { + } else { + r.EncodeBool(bool(x.SerializeImagePulls)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym249 := z.EncBinary() + _ = yym249 + if false { + } else { + r.EncodeBool(bool(x.SerializeImagePulls)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym251 := z.EncBinary() + _ = yym251 + if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) } @@ -2781,8 +2800,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalFlannelOverlay")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym249 := z.EncBinary() - _ = yym249 + yym252 := z.EncBinary() + _ = yym252 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) @@ -2790,42 +2809,42 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[77] { - yy251 := &x.OutOfDiskTransitionFrequency - yym252 := z.EncBinary() - _ = yym252 + if yyq2[78] { + yy254 := &x.OutOfDiskTransitionFrequency + yym255 := z.EncBinary() + _ = yym255 if false { - } else if z.HasExtensions() && z.EncExt(yy251) { - } else if !yym252 && z.IsJSONHandle() { - z.EncJSONMarshal(yy251) + } else if z.HasExtensions() && z.EncExt(yy254) { + } else if !yym255 && z.IsJSONHandle() { + z.EncJSONMarshal(yy254) } else { - z.EncFallback(yy251) + z.EncFallback(yy254) } } else { r.EncodeNil() } } else { - if yyq2[77] { + if yyq2[78] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("outOfDiskTransitionFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy253 := &x.OutOfDiskTransitionFrequency - yym254 := z.EncBinary() - _ = yym254 + yy256 := &x.OutOfDiskTransitionFrequency + yym257 := z.EncBinary() + _ = yym257 if false { - } else if z.HasExtensions() && z.EncExt(yy253) { - } else if !yym254 && z.IsJSONHandle() { - z.EncJSONMarshal(yy253) + } else if z.HasExtensions() && z.EncExt(yy256) { + } else if !yym257 && z.IsJSONHandle() { + z.EncJSONMarshal(yy256) } else { - z.EncFallback(yy253) + z.EncFallback(yy256) } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[78] { - yym256 := z.EncBinary() - _ = yym256 + if yyq2[79] { + yym259 := z.EncBinary() + _ = yym259 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -2834,12 +2853,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[78] { + if yyq2[79] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeIP")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym257 := z.EncBinary() - _ = yym257 + yym260 := z.EncBinary() + _ = yym260 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -2851,8 +2870,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym259 := z.EncBinary() - _ = yym259 + yym262 := z.EncBinary() + _ = yym262 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -2865,8 +2884,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym260 := z.EncBinary() - _ = yym260 + yym263 := z.EncBinary() + _ = yym263 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -2875,8 +2894,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym262 := z.EncBinary() - _ = yym262 + yym265 := z.EncBinary() + _ = yym265 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -2885,8 +2904,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nonMasqueradeCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym263 := z.EncBinary() - _ = yym263 + yym266 := z.EncBinary() + _ = yym266 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -2894,8 +2913,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym265 := z.EncBinary() - _ = yym265 + yym268 := z.EncBinary() + _ = yym268 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -2904,38 +2923,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableCustomMetrics")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym266 := z.EncBinary() - _ = yym266 + yym269 := z.EncBinary() + _ = yym269 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) } } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[82] { - yym268 := z.EncBinary() - _ = yym268 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq2[82] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionHard")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym269 := z.EncBinary() - _ = yym269 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) - } - } - } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq2[83] { @@ -2943,7 +2937,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym271 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2951,13 +2945,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[83] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) + r.EncodeString(codecSelferC_UTF81234, string("evictionHard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym272 := z.EncBinary() _ = yym272 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) } } } @@ -2968,7 +2962,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym274 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -2976,11 +2970,36 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq2[84] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionSoftGracePeriod")) + r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym275 := z.EncBinary() _ = yym275 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[85] { + yym277 := z.EncBinary() + _ = yym277 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2[85] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("evictionSoftGracePeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym278 := z.EncBinary() + _ = yym278 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) } @@ -2988,42 +3007,42 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[85] { - yy277 := &x.EvictionPressureTransitionPeriod - yym278 := z.EncBinary() - _ = yym278 + if yyq2[86] { + yy280 := &x.EvictionPressureTransitionPeriod + yym281 := z.EncBinary() + _ = yym281 if false { - } else if z.HasExtensions() && z.EncExt(yy277) { - } else if !yym278 && z.IsJSONHandle() { - z.EncJSONMarshal(yy277) + } else if z.HasExtensions() && z.EncExt(yy280) { + } else if !yym281 && z.IsJSONHandle() { + z.EncJSONMarshal(yy280) } else { - z.EncFallback(yy277) + z.EncFallback(yy280) } } else { r.EncodeNil() } } else { - if yyq2[85] { + if yyq2[86] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionPressureTransitionPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy279 := &x.EvictionPressureTransitionPeriod - yym280 := z.EncBinary() - _ = yym280 + yy282 := &x.EvictionPressureTransitionPeriod + yym283 := z.EncBinary() + _ = yym283 if false { - } else if z.HasExtensions() && z.EncExt(yy279) { - } else if !yym280 && z.IsJSONHandle() { - z.EncJSONMarshal(yy279) + } else if z.HasExtensions() && z.EncExt(yy282) { + } else if !yym283 && z.IsJSONHandle() { + z.EncJSONMarshal(yy282) } else { - z.EncFallback(yy279) + z.EncFallback(yy282) } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[86] { - yym282 := z.EncBinary() - _ = yym282 + if yyq2[87] { + yym285 := z.EncBinary() + _ = yym285 if false { } else { r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) @@ -3032,12 +3051,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq2[86] { + if yyq2[87] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionMaxPodGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym283 := z.EncBinary() - _ = yym283 + yym286 := z.EncBinary() + _ = yym286 if false { } else { r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) @@ -3234,6 +3253,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } else { x.RootDirectory = string(r.DecodeString()) } + case "seccompProfileRoot": + if r.TryDecodeAsNil() { + x.SeccompProfileRoot = "" + } else { + x.SeccompProfileRoot = string(r.DecodeString()) + } case "allowPrivileged": if r.TryDecodeAsNil() { x.AllowPrivileged = false @@ -3292,15 +3317,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv33 := &x.MinimumGCAge - yym34 := z.DecBinary() - _ = yym34 + yyv34 := &x.MinimumGCAge + yym35 := z.DecBinary() + _ = yym35 if false { - } else if z.HasExtensions() && z.DecExt(yyv33) { - } else if !yym34 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv33) + } else if z.HasExtensions() && z.DecExt(yyv34) { + } else if !yym35 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv34) } else { - z.DecFallback(yyv33, false) + z.DecFallback(yyv34, false) } } case "maxPerPodContainerCount": @@ -3367,45 +3392,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv45 := &x.StreamingConnectionIdleTimeout - yym46 := z.DecBinary() - _ = yym46 + yyv46 := &x.StreamingConnectionIdleTimeout + yym47 := z.DecBinary() + _ = yym47 if false { - } else if z.HasExtensions() && z.DecExt(yyv45) { - } else if !yym46 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv45) + } else if z.HasExtensions() && z.DecExt(yyv46) { + } else if !yym47 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv46) } else { - z.DecFallback(yyv45, false) + z.DecFallback(yyv46, false) } } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv47 := &x.NodeStatusUpdateFrequency - yym48 := z.DecBinary() - _ = yym48 + yyv48 := &x.NodeStatusUpdateFrequency + yym49 := z.DecBinary() + _ = yym49 if false { - } else if z.HasExtensions() && z.DecExt(yyv47) { - } else if !yym48 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv47) + } else if z.HasExtensions() && z.DecExt(yyv48) { + } else if !yym49 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv48) } else { - z.DecFallback(yyv47, false) + z.DecFallback(yyv48, false) } } case "imageMinimumGCAge": if r.TryDecodeAsNil() { x.ImageMinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv49 := &x.ImageMinimumGCAge - yym50 := z.DecBinary() - _ = yym50 + yyv50 := &x.ImageMinimumGCAge + yym51 := z.DecBinary() + _ = yym51 if false { - } else if z.HasExtensions() && z.DecExt(yyv49) { - } else if !yym50 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv49) + } else if z.HasExtensions() && z.DecExt(yyv50) { + } else if !yym51 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv50) } else { - z.DecFallback(yyv49, false) + z.DecFallback(yyv50, false) } } case "imageGCHighThresholdPercent": @@ -3430,15 +3455,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv54 := &x.VolumeStatsAggPeriod - yym55 := z.DecBinary() - _ = yym55 + yyv55 := &x.VolumeStatsAggPeriod + yym56 := z.DecBinary() + _ = yym56 if false { - } else if z.HasExtensions() && z.DecExt(yyv54) { - } else if !yym55 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv54) + } else if z.HasExtensions() && z.DecExt(yyv55) { + } else if !yym56 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv55) } else { - z.DecFallback(yyv54, false) + z.DecFallback(yyv55, false) } } case "networkPluginName": @@ -3643,15 +3668,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv89 := &x.OutOfDiskTransitionFrequency - yym90 := z.DecBinary() - _ = yym90 + yyv90 := &x.OutOfDiskTransitionFrequency + yym91 := z.DecBinary() + _ = yym91 if false { - } else if z.HasExtensions() && z.DecExt(yyv89) { - } else if !yym90 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv89) + } else if z.HasExtensions() && z.DecExt(yyv90) { + } else if !yym91 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv90) } else { - z.DecFallback(yyv89, false) + z.DecFallback(yyv90, false) } } case "nodeIP": @@ -3664,12 +3689,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv92 := &x.NodeLabels - yym93 := z.DecBinary() - _ = yym93 + yyv93 := &x.NodeLabels + yym94 := z.DecBinary() + _ = yym94 if false { } else { - z.F.DecMapStringStringX(yyv92, false, d) + z.F.DecMapStringStringX(yyv93, false, d) } } case "nonMasqueradeCIDR": @@ -3706,15 +3731,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv99 := &x.EvictionPressureTransitionPeriod - yym100 := z.DecBinary() - _ = yym100 + yyv100 := &x.EvictionPressureTransitionPeriod + yym101 := z.DecBinary() + _ = yym101 if false { - } else if z.HasExtensions() && z.DecExt(yyv99) { - } else if !yym100 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv99) + } else if z.HasExtensions() && z.DecExt(yyv100) { + } else if !yym101 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv100) } else { - z.DecFallback(yyv99, false) + z.DecFallback(yyv100, false) } } case "evictionMaxPodGracePeriod": @@ -3734,16 +3759,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj102 int - var yyb102 bool - var yyhl102 bool = l >= 0 - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + var yyj103 int + var yyb103 bool + var yyhl103 bool = l >= 0 + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3753,13 +3778,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Config = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3767,24 +3792,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv104 := &x.SyncFrequency - yym105 := z.DecBinary() - _ = yym105 + yyv105 := &x.SyncFrequency + yym106 := z.DecBinary() + _ = yym106 if false { - } else if z.HasExtensions() && z.DecExt(yyv104) { - } else if !yym105 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv104) + } else if z.HasExtensions() && z.DecExt(yyv105) { + } else if !yym106 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv105) } else { - z.DecFallback(yyv104, false) + z.DecFallback(yyv105, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3792,24 +3817,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv106 := &x.FileCheckFrequency - yym107 := z.DecBinary() - _ = yym107 + yyv107 := &x.FileCheckFrequency + yym108 := z.DecBinary() + _ = yym108 if false { - } else if z.HasExtensions() && z.DecExt(yyv106) { - } else if !yym107 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv106) + } else if z.HasExtensions() && z.DecExt(yyv107) { + } else if !yym108 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv107) } else { - z.DecFallback(yyv106, false) + z.DecFallback(yyv107, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3817,24 +3842,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv108 := &x.HTTPCheckFrequency - yym109 := z.DecBinary() - _ = yym109 + yyv109 := &x.HTTPCheckFrequency + yym110 := z.DecBinary() + _ = yym110 if false { - } else if z.HasExtensions() && z.DecExt(yyv108) { - } else if !yym109 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv108) + } else if z.HasExtensions() && z.DecExt(yyv109) { + } else if !yym110 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv109) } else { - z.DecFallback(yyv108, false) + z.DecFallback(yyv109, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3844,13 +3869,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3860,13 +3885,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3876,13 +3901,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3892,13 +3917,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3908,13 +3933,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3924,13 +3949,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3940,13 +3965,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3956,13 +3981,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3972,13 +3997,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3988,13 +4013,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4004,13 +4029,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4020,13 +4045,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4036,13 +4061,29 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.SeccompProfileRoot = "" + } else { + x.SeccompProfileRoot = string(r.DecodeString()) + } + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4052,13 +4093,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4068,13 +4109,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostNetworkSources = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4084,13 +4125,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostPIDSources = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4100,13 +4141,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostIPCSources = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4116,13 +4157,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = float64(r.DecodeFloat(false)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4132,13 +4173,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4148,13 +4189,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = float32(r.DecodeFloat(true)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4164,13 +4205,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4180,13 +4221,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4194,24 +4235,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv132 := &x.MinimumGCAge - yym133 := z.DecBinary() - _ = yym133 + yyv134 := &x.MinimumGCAge + yym135 := z.DecBinary() + _ = yym135 if false { - } else if z.HasExtensions() && z.DecExt(yyv132) { - } else if !yym133 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv132) + } else if z.HasExtensions() && z.DecExt(yyv134) { + } else if !yym135 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv134) } else { - z.DecFallback(yyv132, false) + z.DecFallback(yyv134, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4221,13 +4262,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4237,13 +4278,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4253,13 +4294,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4269,13 +4310,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4285,13 +4326,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4301,13 +4342,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4317,13 +4358,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4333,13 +4374,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4349,13 +4390,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4365,13 +4406,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4379,32 +4420,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv144 := &x.StreamingConnectionIdleTimeout - yym145 := z.DecBinary() - _ = yym145 - if false { - } else if z.HasExtensions() && z.DecExt(yyv144) { - } else if !yym145 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv144) - } else { - z.DecFallback(yyv144, false) - } - } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l - } else { - yyb102 = r.CheckBreak() - } - if yyb102 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} - } else { - yyv146 := &x.NodeStatusUpdateFrequency + yyv146 := &x.StreamingConnectionIdleTimeout yym147 := z.DecBinary() _ = yym147 if false { @@ -4415,21 +4431,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv146, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv148 := &x.ImageMinimumGCAge + yyv148 := &x.NodeStatusUpdateFrequency yym149 := z.DecBinary() _ = yym149 if false { @@ -4440,13 +4456,38 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv148, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + } else { + yyv150 := &x.ImageMinimumGCAge + yym151 := z.DecBinary() + _ = yym151 + if false { + } else if z.HasExtensions() && z.DecExt(yyv150) { + } else if !yym151 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv150) + } else { + z.DecFallback(yyv150, false) + } + } + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4456,13 +4497,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCHighThresholdPercent = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4472,13 +4513,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCLowThresholdPercent = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4488,13 +4529,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LowDiskSpaceThresholdMB = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4502,24 +4543,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv153 := &x.VolumeStatsAggPeriod - yym154 := z.DecBinary() - _ = yym154 + yyv155 := &x.VolumeStatsAggPeriod + yym156 := z.DecBinary() + _ = yym156 if false { - } else if z.HasExtensions() && z.DecExt(yyv153) { - } else if !yym154 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv153) + } else if z.HasExtensions() && z.DecExt(yyv155) { + } else if !yym156 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv155) } else { - z.DecFallback(yyv153, false) + z.DecFallback(yyv155, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4529,13 +4570,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4545,13 +4586,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4561,13 +4602,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4577,13 +4618,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4593,13 +4634,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4609,13 +4650,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeletCgroups = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4625,13 +4666,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RuntimeCgroups = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4641,13 +4682,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemCgroups = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4657,13 +4698,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4673,13 +4714,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4689,13 +4730,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4705,13 +4746,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktAPIEndpoint = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4721,13 +4762,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4737,13 +4778,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LockFilePath = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4753,13 +4794,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExitOnLockContention = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4769,13 +4810,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ConfigureCBR0 = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4785,13 +4826,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HairpinMode = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4801,13 +4842,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.BabysitDaemons = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4817,13 +4858,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4833,13 +4874,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NvidiaGPUs = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4849,13 +4890,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4865,13 +4906,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4881,13 +4922,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4897,13 +4938,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4913,13 +4954,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4929,13 +4970,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = uint64(r.DecodeUint(64)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4945,13 +4986,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4961,13 +5002,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4977,13 +5018,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContentType = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4993,13 +5034,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5009,13 +5050,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5025,13 +5066,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5041,13 +5082,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalFlannelOverlay = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5055,24 +5096,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv188 := &x.OutOfDiskTransitionFrequency - yym189 := z.DecBinary() - _ = yym189 + yyv190 := &x.OutOfDiskTransitionFrequency + yym191 := z.DecBinary() + _ = yym191 if false { - } else if z.HasExtensions() && z.DecExt(yyv188) { - } else if !yym189 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv188) + } else if z.HasExtensions() && z.DecExt(yyv190) { + } else if !yym191 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv190) } else { - z.DecFallback(yyv188, false) + z.DecFallback(yyv190, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5082,13 +5123,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5096,21 +5137,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv191 := &x.NodeLabels - yym192 := z.DecBinary() - _ = yym192 + yyv193 := &x.NodeLabels + yym194 := z.DecBinary() + _ = yym194 if false { } else { - z.F.DecMapStringStringX(yyv191, false, d) + z.F.DecMapStringStringX(yyv193, false, d) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5120,13 +5161,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5136,13 +5177,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableCustomMetrics = bool(r.DecodeBool()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5152,13 +5193,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionHard = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5168,13 +5209,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoft = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5184,13 +5225,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoftGracePeriod = string(r.DecodeString()) } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5198,24 +5239,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv198 := &x.EvictionPressureTransitionPeriod - yym199 := z.DecBinary() - _ = yym199 + yyv200 := &x.EvictionPressureTransitionPeriod + yym201 := z.DecBinary() + _ = yym201 if false { - } else if z.HasExtensions() && z.DecExt(yyv198) { - } else if !yym199 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv198) + } else if z.HasExtensions() && z.DecExt(yyv200) { + } else if !yym201 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv200) } else { - z.DecFallback(yyv198, false) + z.DecFallback(yyv200, false) } } - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5226,17 +5267,17 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.EvictionMaxPodGracePeriod = int32(r.DecodeInt(32)) } for { - yyj102++ - if yyhl102 { - yyb102 = yyj102 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb102 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb102 { + if yyb103 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj102-1, "") + z.DecStructFieldNotFound(yyj103-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index dd289700ef..8af775abb0 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -151,6 +151,8 @@ type KubeletConfiguration struct { // rootDirectory is the directory path to place kubelet files (volume // mounts,etc). RootDirectory string `json:"rootDirectory"` + // seccompProfileRoot is the directory path for seccomp profiles. + SeccompProfileRoot string `json:"seccompProfileRoot"` // allowPrivileged enables containers to request privileged mode. // Defaults to false. AllowPrivileged bool `json:"allowPrivileged"` diff --git a/pkg/kubelet/dockertools/fake_manager.go b/pkg/kubelet/dockertools/fake_manager.go index 3d56a6af2d..38c801e35a 100644 --- a/pkg/kubelet/dockertools/fake_manager.go +++ b/pkg/kubelet/dockertools/fake_manager.go @@ -51,7 +51,7 @@ func NewFakeDockerManager( fakePodGetter := &fakePodGetter{} dm := NewDockerManager(client, recorder, livenessManager, containerRefManager, fakePodGetter, machineInfo, podInfraContainerImage, qps, burst, containerLogsDir, osInterface, networkPlugin, runtimeHelper, httpClient, &NativeExecHandler{}, - fakeOOMAdjuster, fakeProcFs, false, imageBackOff, false, false, true) + fakeOOMAdjuster, fakeProcFs, false, imageBackOff, false, false, true, "/var/lib/kubelet/seccomp") dm.dockerPuller = &FakeDockerPuller{} // ttl of version cache is set to 0 so we always call version api directly in tests. diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index fea46a5a52..37ec1c1415 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -18,6 +18,7 @@ package dockertools import ( "bytes" + "encoding/json" "errors" "fmt" "io" @@ -25,6 +26,7 @@ import ( "os" "os/exec" "path" + "path/filepath" "strconv" "strings" "sync" @@ -102,8 +104,7 @@ var ( // TODO: make this a TTL based pull (if image older than X policy, pull) podInfraContainerImagePullPolicy = api.PullIfNotPresent - // Default set of security options. Seccomp is disabled by default until - // github issue #20870 is resolved. + // Default set of security options. defaultSecurityOpt = []string{"seccomp:unconfined"} ) @@ -172,6 +173,9 @@ type DockerManager struct { // The version cache of docker daemon. versionCache *cache.ObjectCache + + // Directory to host local seccomp profiles. + seccompProfileRoot string } // A subset of the pod.Manager interface extracted for testing purposes. @@ -214,6 +218,7 @@ func NewDockerManager( serializeImagePulls bool, enableCustomMetrics bool, hairpinMode bool, + seccompProfileRoot string, options ...kubecontainer.Option) *DockerManager { // Wrap the docker client with instrumentedDockerInterface client = newInstrumentedDockerInterface(client) @@ -250,6 +255,7 @@ func NewDockerManager( enableCustomMetrics: enableCustomMetrics, configureHairpinMode: hairpinMode, imageStatsProvider: &imageStatsProvider{client}, + seccompProfileRoot: seccompProfileRoot, } dm.runner = lifecycle.NewHandlerRunner(httpClient, dm, dm) if serializeImagePulls { @@ -552,7 +558,7 @@ func (dm *DockerManager) runContainer( ContainerName: container.Name, } - securityOpts, err := dm.getDefaultSecurityOpt() + securityOpts, err := dm.getSecurityOpt(pod, container.Name) if err != nil { return kubecontainer.ContainerID{}, err } @@ -971,20 +977,57 @@ func (dm *DockerManager) checkVersionCompatibility() error { return nil } -func (dm *DockerManager) getDefaultSecurityOpt() ([]string, error) { +func (dm *DockerManager) getSecurityOpt(pod *api.Pod, ctrName string) ([]string, error) { version, err := dm.APIVersion() if err != nil { return nil, err } - // seccomp is to be disabled on docker versions >= v1.10 + + // seccomp is only on docker versions >= v1.10 result, err := version.Compare(dockerV110APIVersion) if err != nil { return nil, err } - if result >= 0 { + if result < 0 { + // return early for old versions + return nil, nil + } + + profile, profileOK := pod.ObjectMeta.Annotations["security.alpha.kubernetes.io/seccomp/container/"+ctrName] + if !profileOK { + // try the pod profile + profile, profileOK = pod.ObjectMeta.Annotations["security.alpha.kubernetes.io/seccomp/pod"] + if !profileOK { + // return early the default + return defaultSecurityOpt, nil + } + } + + if profile == "unconfined" { + // return early the default return defaultSecurityOpt, nil } - return nil, nil + + if profile == "docker/default" { + // return nil so docker will load the default seccomp profile + return nil, nil + } + + if !strings.HasPrefix(profile, "localhost") { + return nil, fmt.Errorf("unknown seccomp profile option: %s", profile) + } + + file, err := ioutil.ReadFile(filepath.Join(dm.seccompProfileRoot, strings.TrimPrefix(profile, "localhost/"))) + if err != nil { + return nil, err + } + + b := bytes.NewBuffer(nil) + if err := json.Compact(b, file); err != nil { + return nil, err + } + + return []string{fmt.Sprintf("seccomp=%s", b.Bytes())}, nil } type dockerExitError struct { diff --git a/pkg/kubelet/dockertools/manager_test.go b/pkg/kubelet/dockertools/manager_test.go index a1c55c83e9..1d23247207 100644 --- a/pkg/kubelet/dockertools/manager_test.go +++ b/pkg/kubelet/dockertools/manager_test.go @@ -1714,7 +1714,7 @@ func verifySyncResults(t *testing.T, expectedResults []*kubecontainer.SyncResult } } -func TestSeccompIsDisabledWithDockerV110(t *testing.T) { +func TestSeccompIsUnconfinedByDefaultWithDockerV110(t *testing.T) { dm, fakeDocker := newTestDockerManagerWithVersion("1.10.1", "1.22") pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ @@ -1750,7 +1750,134 @@ func TestSeccompIsDisabledWithDockerV110(t *testing.T) { if err != nil { t.Fatalf("unexpected error %v", err) } - assert.Contains(t, newContainer.HostConfig.SecurityOpt, "seccomp:unconfined", "Pods with Docker versions >= 1.10 must have seccomp disabled.") + assert.Contains(t, newContainer.HostConfig.SecurityOpt, "seccomp:unconfined", "Pods with Docker versions >= 1.10 must not have seccomp disabled by default") +} + +func TestUnconfinedSeccompProfileWithDockerV110(t *testing.T) { + dm, fakeDocker := newTestDockerManagerWithVersion("1.10.1", "1.22") + pod := &api.Pod{ + ObjectMeta: api.ObjectMeta{ + UID: "12345678", + Name: "foo4", + Namespace: "new", + Annotations: map[string]string{ + "security.alpha.kubernetes.io/seccomp/pod": "unconfined", + }, + }, + Spec: api.PodSpec{ + Containers: []api.Container{ + {Name: "bar4"}, + }, + }, + } + + runSyncPod(t, dm, fakeDocker, pod, nil, false) + + verifyCalls(t, fakeDocker, []string{ + // Create pod infra container. + "create", "start", "inspect_container", "inspect_container", + // Create container. + "create", "start", "inspect_container", + }) + + fakeDocker.Lock() + if len(fakeDocker.Created) != 2 || + !matchString(t, "/k8s_POD\\.[a-f0-9]+_foo4_new_", fakeDocker.Created[0]) || + !matchString(t, "/k8s_bar4\\.[a-f0-9]+_foo4_new_", fakeDocker.Created[1]) { + t.Errorf("unexpected containers created %v", fakeDocker.Created) + } + fakeDocker.Unlock() + + newContainer, err := fakeDocker.InspectContainer(fakeDocker.Created[1]) + if err != nil { + t.Fatalf("unexpected error %v", err) + } + assert.Contains(t, newContainer.HostConfig.SecurityOpt, "seccomp:unconfined", "Pods created with a secccomp annotation of unconfined should have seccomp:unconfined.") +} + +func TestDefaultSeccompProfileWithDockerV110(t *testing.T) { + dm, fakeDocker := newTestDockerManagerWithVersion("1.10.1", "1.22") + pod := &api.Pod{ + ObjectMeta: api.ObjectMeta{ + UID: "12345678", + Name: "foo1", + Namespace: "new", + Annotations: map[string]string{ + "security.alpha.kubernetes.io/seccomp/pod": "docker/default", + }, + }, + Spec: api.PodSpec{ + Containers: []api.Container{ + {Name: "bar1"}, + }, + }, + } + + runSyncPod(t, dm, fakeDocker, pod, nil, false) + + verifyCalls(t, fakeDocker, []string{ + // Create pod infra container. + "create", "start", "inspect_container", "inspect_container", + // Create container. + "create", "start", "inspect_container", + }) + + fakeDocker.Lock() + if len(fakeDocker.Created) != 2 || + !matchString(t, "/k8s_POD\\.[a-f0-9]+_foo1_new_", fakeDocker.Created[0]) || + !matchString(t, "/k8s_bar1\\.[a-f0-9]+_foo1_new_", fakeDocker.Created[1]) { + t.Errorf("unexpected containers created %v", fakeDocker.Created) + } + fakeDocker.Unlock() + + newContainer, err := fakeDocker.InspectContainer(fakeDocker.Created[1]) + if err != nil { + t.Fatalf("unexpected error %v", err) + } + assert.NotContains(t, newContainer.HostConfig.SecurityOpt, "seccomp:unconfined", "Pods created with a secccomp annotation of docker/default should have empty security opt.") +} + +func TestSeccompContainerAnnotationTrumpsPod(t *testing.T) { + dm, fakeDocker := newTestDockerManagerWithVersion("1.10.1", "1.22") + pod := &api.Pod{ + ObjectMeta: api.ObjectMeta{ + UID: "12345678", + Name: "foo2", + Namespace: "new", + Annotations: map[string]string{ + "security.alpha.kubernetes.io/seccomp/pod": "unconfined", + "security.alpha.kubernetes.io/seccomp/container/bar2": "docker/default", + }, + }, + Spec: api.PodSpec{ + Containers: []api.Container{ + {Name: "bar2"}, + }, + }, + } + + runSyncPod(t, dm, fakeDocker, pod, nil, false) + + verifyCalls(t, fakeDocker, []string{ + // Create pod infra container. + "create", "start", "inspect_container", "inspect_container", + // Create container. + "create", "start", "inspect_container", + }) + + fakeDocker.Lock() + if len(fakeDocker.Created) != 2 || + !matchString(t, "/k8s_POD\\.[a-f0-9]+_foo2_new_", fakeDocker.Created[0]) || + !matchString(t, "/k8s_bar2\\.[a-f0-9]+_foo2_new_", fakeDocker.Created[1]) { + t.Errorf("unexpected containers created %v", fakeDocker.Created) + } + fakeDocker.Unlock() + + newContainer, err := fakeDocker.InspectContainer(fakeDocker.Created[1]) + if err != nil { + t.Fatalf("unexpected error %v", err) + } + assert.NotContains(t, newContainer.HostConfig.SecurityOpt, "seccomp:unconfined", "Container annotation should trump the pod annotation for seccomp.") } func TestSecurityOptsAreNilWithDockerV19(t *testing.T) { diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index d09ace61b6..b91a2adafe 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -177,6 +177,7 @@ func NewMainKubelet( dockerClient dockertools.DockerInterface, kubeClient clientset.Interface, rootDirectory string, + seccompProfileRoot string, podInfraContainerImage string, resyncInterval time.Duration, pullQPS float32, @@ -423,6 +424,7 @@ func NewMainKubelet( serializeImagePulls, enableCustomMetrics, klet.hairpinMode == componentconfig.HairpinVeth, + seccompProfileRoot, containerRuntimeOptions..., ) case "rkt": diff --git a/test/e2e_node/image.go b/test/e2e_node/image.go index 7e32a10b5a..8a47e5406f 100644 --- a/test/e2e_node/image.go +++ b/test/e2e_node/image.go @@ -47,7 +47,7 @@ func dockerRuntime() kubecontainer.Runtime { nil, nil, nil, pm, nil, "", 0, 0, "", nil, nil, nil, nil, nil, nil, nil, - false, nil, true, false, false, + false, nil, true, false, false, "", ) return dm