From 641ba92aa375b84fdfbc020e890aa961956b6e33 Mon Sep 17 00:00:00 2001 From: mqliang Date: Sun, 24 Jan 2016 16:54:51 +0800 Subject: [PATCH] move minGCAge to ImageGCPolicy and make it configurable --- cmd/kubelet/app/options/options.go | 2 + cmd/kubelet/app/server.go | 1 + docs/admin/kubelet.md | 3 +- hack/verify-flags/known-flags.txt | 1 + pkg/apis/componentconfig/types.generated.go | 1521 ++++++++++--------- pkg/apis/componentconfig/types.go | 3 + pkg/kubelet/image_manager.go | 15 +- pkg/kubelet/image_manager_test.go | 5 +- 8 files changed, 810 insertions(+), 741 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 1eb5dfff642..bcf30281277 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -87,6 +87,7 @@ func NewKubeletServer() *KubeletServer { HostPIDSources: kubetypes.AllSource, HostIPCSources: kubetypes.AllSource, HTTPCheckFrequency: unversioned.Duration{20 * time.Second}, + ImageMinimumGCAge: unversioned.Duration{2 * time.Minute}, ImageGCHighThresholdPercent: 90, ImageGCLowThresholdPercent: 80, LowDiskSpaceThresholdMB: 256, @@ -182,6 +183,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.DurationVar(&s.NodeStatusUpdateFrequency.Duration, "node-status-update-frequency", s.NodeStatusUpdateFrequency.Duration, "Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s") bindableNodeLabels := util.ConfigurationMap(s.NodeLabels) fs.Var(&bindableNodeLabels, "node-labels", " Labels to add when registering the node in the cluster. Labels must are key=value pairs seperated by ','.") + fs.DurationVar(&s.ImageMinimumGCAge.Duration, "minimum-image-ttl-duration", s.ImageMinimumGCAge.Duration, "Minimum age for a unused image before it is garbage collected. Examples: '300ms', '10s' or '2h45m'. Default: '2m'") fs.IntVar(&s.ImageGCHighThresholdPercent, "image-gc-high-threshold", s.ImageGCHighThresholdPercent, "The percent of disk usage after which image garbage collection is always run. Default: 90%") fs.IntVar(&s.ImageGCLowThresholdPercent, "image-gc-low-threshold", s.ImageGCLowThresholdPercent, "The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. Default: 80%") fs.IntVar(&s.LowDiskSpaceThresholdMB, "low-diskspace-threshold-mb", s.LowDiskSpaceThresholdMB, "The absolute free disk space, in MB, to maintain. When disk space falls below this threshold, new pods would be rejected. Default: 256") diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 04c287a155d..31e284d6ff2 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -154,6 +154,7 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) { } imageGCPolicy := kubelet.ImageGCPolicy{ + MinAge: s.ImageMinimumGCAge.Duration, HighThresholdPercent: s.ImageGCHighThresholdPercent, LowThresholdPercent: s.ImageGCLowThresholdPercent, } diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md index 12546964f8a..8f8d0b24427 100644 --- a/docs/admin/kubelet.md +++ b/docs/admin/kubelet.md @@ -116,6 +116,7 @@ kubelet --maximum-dead-containers=100: Maximum number of old instances of containers to retain globally. Each container takes up some disk space. Default: 100. --maximum-dead-containers-per-container=2: Maximum number of old instances to retain per container. Each container takes up some disk space. Default: 2. --minimum-container-ttl-duration=1m0s: Minimum age for a finished container before it is garbage collected. Examples: '300ms', '10s' or '2h45m' + --minimum-image-ttl-duration=2m0s: Minimum age for a unused image before it is garbage collected. Examples: '300ms', '10s' or '2h45m'. Default: '2m' --network-plugin="": The name of the network plugin to be invoked for various events in kubelet/pod lifecycle --network-plugin-dir="/usr/libexec/kubernetes/kubelet-plugins/net/exec/": The full path of the directory in which to search for network plugins --node-ip="": IP address of the node. If set, kubelet will use this IP address for the node @@ -151,7 +152,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 12-Feb-2016 +###### Auto generated by spf13/cobra on 15-Feb-2016 diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 4653a395c15..8754189a7c7 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -229,6 +229,7 @@ min-pr-number min-request-timeout min-resync-period minimum-container-ttl-duration +minimum-image-ttl-duration minion-max-log-age minion-max-log-backups minion-max-log-size diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index 755fe14a6b2..445449a2c8a 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -1108,24 +1108,24 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [76]bool + var yyq2 [77]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false - yyq2[46] = x.CloudProvider != "" - yyq2[47] = x.CloudConfigFile != "" - yyq2[48] = x.KubeletCgroups != "" - yyq2[49] = x.RuntimeCgroups != "" - yyq2[50] = x.SystemCgroups != "" - yyq2[51] = x.CgroupRoot != "" - yyq2[53] = x.RktPath != "" - yyq2[55] = x.RktStage1Image != "" - yyq2[71] = true - yyq2[72] = x.NodeIP != "" + 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[56] = x.RktStage1Image != "" + yyq2[72] = true + yyq2[73] = x.NodeIP != "" var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(76) + r.EncodeArrayStart(77) } else { - yynn2 = 66 + yynn2 = 67 for _, b := range yyq2 { if b { yynn2++ @@ -1925,8 +1925,35 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym133 := z.EncBinary() - _ = yym133 + yy133 := &x.ImageMinimumGCAge + yym134 := z.EncBinary() + _ = yym134 + if false { + } else if z.HasExtensions() && z.EncExt(yy133) { + } else if !yym134 && z.IsJSONHandle() { + z.EncJSONMarshal(yy133) + } else { + z.EncFallback(yy133) + } + } 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)) @@ -1935,8 +1962,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCHighThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym134 := z.EncBinary() - _ = yym134 + yym139 := z.EncBinary() + _ = yym139 if false { } else { r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) @@ -1944,8 +1971,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym136 := z.EncBinary() - _ = yym136 + yym141 := z.EncBinary() + _ = yym141 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) @@ -1954,8 +1981,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCLowThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym137 := z.EncBinary() - _ = yym137 + yym142 := z.EncBinary() + _ = yym142 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) @@ -1963,8 +1990,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym139 := z.EncBinary() - _ = yym139 + yym144 := z.EncBinary() + _ = yym144 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) @@ -1973,8 +2000,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lowDiskSpaceThresholdMB")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym140 := z.EncBinary() - _ = yym140 + yym145 := z.EncBinary() + _ = yym145 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) @@ -1982,35 +2009,35 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy142 := &x.VolumeStatsAggPeriod - yym143 := z.EncBinary() - _ = yym143 + yy147 := &x.VolumeStatsAggPeriod + yym148 := z.EncBinary() + _ = yym148 if false { - } else if z.HasExtensions() && z.EncExt(yy142) { - } else if !yym143 && z.IsJSONHandle() { - z.EncJSONMarshal(yy142) + } else if z.HasExtensions() && z.EncExt(yy147) { + } else if !yym148 && z.IsJSONHandle() { + z.EncJSONMarshal(yy147) } else { - z.EncFallback(yy142) + z.EncFallback(yy147) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("VolumeStatsAggPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy144 := &x.VolumeStatsAggPeriod - yym145 := z.EncBinary() - _ = yym145 + yy149 := &x.VolumeStatsAggPeriod + yym150 := z.EncBinary() + _ = yym150 if false { - } else if z.HasExtensions() && z.EncExt(yy144) { - } else if !yym145 && z.IsJSONHandle() { - z.EncJSONMarshal(yy144) + } else if z.HasExtensions() && z.EncExt(yy149) { + } else if !yym150 && z.IsJSONHandle() { + z.EncJSONMarshal(yy149) } else { - z.EncFallback(yy144) + z.EncFallback(yy149) } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym147 := z.EncBinary() - _ = yym147 + yym152 := z.EncBinary() + _ = yym152 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) @@ -2019,8 +2046,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym148 := z.EncBinary() - _ = yym148 + yym153 := z.EncBinary() + _ = yym153 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) @@ -2028,8 +2055,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym150 := z.EncBinary() - _ = yym150 + yym155 := z.EncBinary() + _ = yym155 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) @@ -2038,8 +2065,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym151 := z.EncBinary() - _ = yym151 + yym156 := z.EncBinary() + _ = yym156 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) @@ -2047,8 +2074,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym153 := z.EncBinary() - _ = yym153 + yym158 := z.EncBinary() + _ = yym158 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) @@ -2057,8 +2084,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym154 := z.EncBinary() - _ = yym154 + yym159 := z.EncBinary() + _ = yym159 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) @@ -2066,9 +2093,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[46] { - yym156 := z.EncBinary() - _ = yym156 + if yyq2[47] { + yym161 := z.EncBinary() + _ = yym161 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -2077,62 +2104,62 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[46] { + if yyq2[47] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym157 := z.EncBinary() - _ = yym157 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[47] { - yym159 := z.EncBinary() - _ = yym159 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq2[47] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym160 := z.EncBinary() - _ = yym160 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[48] { yym162 := z.EncBinary() _ = yym162 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[48] { + yym164 := z.EncBinary() + _ = yym164 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { if yyq2[48] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym165 := z.EncBinary() + _ = yym165 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[49] { + yym167 := z.EncBinary() + _ = yym167 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2[49] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeletCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym163 := z.EncBinary() - _ = yym163 + yym168 := z.EncBinary() + _ = yym168 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) @@ -2141,9 +2168,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[49] { - yym165 := z.EncBinary() - _ = yym165 + if yyq2[50] { + yym170 := z.EncBinary() + _ = yym170 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) @@ -2152,62 +2179,62 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[49] { + if yyq2[50] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runtimeCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym166 := z.EncBinary() - _ = yym166 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) - } - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[50] { - yym168 := z.EncBinary() - _ = yym168 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq2[50] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("systemContainer")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym169 := z.EncBinary() - _ = yym169 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) - } - } - } - if yyr2 || yy2arr2 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[51] { yym171 := z.EncBinary() _ = yym171 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[51] { + yym173 := z.EncBinary() + _ = yym173 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { if yyq2[51] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("systemContainer")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym174 := z.EncBinary() + _ = yym174 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2[52] { + yym176 := z.EncBinary() + _ = yym176 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2[52] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym172 := z.EncBinary() - _ = yym172 + yym177 := z.EncBinary() + _ = yym177 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) @@ -2216,8 +2243,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym174 := z.EncBinary() - _ = yym174 + yym179 := z.EncBinary() + _ = yym179 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) @@ -2226,8 +2253,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerRuntime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym175 := z.EncBinary() - _ = yym175 + yym180 := z.EncBinary() + _ = yym180 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) @@ -2235,9 +2262,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[53] { - yym177 := z.EncBinary() - _ = yym177 + if yyq2[54] { + yym182 := z.EncBinary() + _ = yym182 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) @@ -2246,12 +2273,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[53] { + if yyq2[54] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rktPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym178 := z.EncBinary() - _ = yym178 + yym183 := z.EncBinary() + _ = yym183 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) @@ -2260,8 +2287,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym180 := z.EncBinary() - _ = yym180 + yym185 := z.EncBinary() + _ = yym185 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) @@ -2270,8 +2297,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lockFilePath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym181 := z.EncBinary() - _ = yym181 + yym186 := z.EncBinary() + _ = yym186 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) @@ -2279,9 +2306,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[55] { - yym183 := z.EncBinary() - _ = yym183 + if yyq2[56] { + yym188 := z.EncBinary() + _ = yym188 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) @@ -2290,12 +2317,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[55] { + if yyq2[56] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rktStage1Image")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym184 := z.EncBinary() - _ = yym184 + yym189 := z.EncBinary() + _ = yym189 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) @@ -2304,8 +2331,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym186 := z.EncBinary() - _ = yym186 + yym191 := z.EncBinary() + _ = yym191 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) @@ -2314,8 +2341,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym187 := z.EncBinary() - _ = yym187 + yym192 := z.EncBinary() + _ = yym192 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) @@ -2323,8 +2350,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym189 := z.EncBinary() - _ = yym189 + yym194 := z.EncBinary() + _ = yym194 if false { } else { r.EncodeBool(bool(x.HairpinMode)) @@ -2333,8 +2360,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureHairpinMode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym190 := z.EncBinary() - _ = yym190 + yym195 := z.EncBinary() + _ = yym195 if false { } else { r.EncodeBool(bool(x.HairpinMode)) @@ -2342,8 +2369,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym192 := z.EncBinary() - _ = yym192 + yym197 := z.EncBinary() + _ = yym197 if false { } else { r.EncodeInt(int64(x.MaxPods)) @@ -2352,8 +2379,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxPods")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym193 := z.EncBinary() - _ = yym193 + yym198 := z.EncBinary() + _ = yym198 if false { } else { r.EncodeInt(int64(x.MaxPods)) @@ -2361,8 +2388,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym195 := z.EncBinary() - _ = yym195 + yym200 := z.EncBinary() + _ = yym200 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) @@ -2371,8 +2398,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym196 := z.EncBinary() - _ = yym196 + yym201 := z.EncBinary() + _ = yym201 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) @@ -2380,8 +2407,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym198 := z.EncBinary() - _ = yym198 + yym203 := z.EncBinary() + _ = yym203 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) @@ -2390,8 +2417,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym199 := z.EncBinary() - _ = yym199 + yym204 := z.EncBinary() + _ = yym204 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) @@ -2399,8 +2426,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym201 := z.EncBinary() - _ = yym201 + yym206 := z.EncBinary() + _ = yym206 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) @@ -2409,8 +2436,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym202 := z.EncBinary() - _ = yym202 + yym207 := z.EncBinary() + _ = yym207 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) @@ -2418,8 +2445,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym204 := z.EncBinary() - _ = yym204 + yym209 := z.EncBinary() + _ = yym209 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) @@ -2428,8 +2455,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym205 := z.EncBinary() - _ = yym205 + yym210 := z.EncBinary() + _ = yym210 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) @@ -2437,8 +2464,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym207 := z.EncBinary() - _ = yym207 + yym212 := z.EncBinary() + _ = yym212 if false { } else { r.EncodeBool(bool(x.Containerized)) @@ -2447,8 +2474,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerized")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym208 := z.EncBinary() - _ = yym208 + yym213 := z.EncBinary() + _ = yym213 if false { } else { r.EncodeBool(bool(x.Containerized)) @@ -2456,8 +2483,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym210 := z.EncBinary() - _ = yym210 + yym215 := z.EncBinary() + _ = yym215 if false { } else { r.EncodeUint(uint64(x.MaxOpenFiles)) @@ -2466,8 +2493,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym211 := z.EncBinary() - _ = yym211 + yym216 := z.EncBinary() + _ = yym216 if false { } else { r.EncodeUint(uint64(x.MaxOpenFiles)) @@ -2475,8 +2502,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym213 := z.EncBinary() - _ = yym213 + yym218 := z.EncBinary() + _ = yym218 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) @@ -2485,8 +2512,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym214 := z.EncBinary() - _ = yym214 + yym219 := z.EncBinary() + _ = yym219 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) @@ -2494,8 +2521,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym216 := z.EncBinary() - _ = yym216 + yym221 := z.EncBinary() + _ = yym221 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) @@ -2504,8 +2531,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym217 := z.EncBinary() - _ = yym217 + yym222 := z.EncBinary() + _ = yym222 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) @@ -2513,8 +2540,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym219 := z.EncBinary() - _ = yym219 + yym224 := z.EncBinary() + _ = yym224 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -2523,8 +2550,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym220 := z.EncBinary() - _ = yym220 + yym225 := z.EncBinary() + _ = yym225 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -2532,8 +2559,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym222 := z.EncBinary() - _ = yym222 + yym227 := z.EncBinary() + _ = yym227 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -2542,8 +2569,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym223 := z.EncBinary() - _ = yym223 + yym228 := z.EncBinary() + _ = yym228 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -2551,8 +2578,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym225 := z.EncBinary() - _ = yym225 + yym230 := z.EncBinary() + _ = yym230 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) @@ -2561,8 +2588,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym226 := z.EncBinary() - _ = yym226 + yym231 := z.EncBinary() + _ = yym231 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) @@ -2570,8 +2597,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym228 := z.EncBinary() - _ = yym228 + yym233 := z.EncBinary() + _ = yym233 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) @@ -2580,8 +2607,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalFlannelOverlay")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym229 := z.EncBinary() - _ = yym229 + yym234 := z.EncBinary() + _ = yym234 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) @@ -2589,42 +2616,42 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[71] { - yy231 := &x.OutOfDiskTransitionFrequency - yym232 := z.EncBinary() - _ = yym232 + if yyq2[72] { + yy236 := &x.OutOfDiskTransitionFrequency + yym237 := z.EncBinary() + _ = yym237 if false { - } else if z.HasExtensions() && z.EncExt(yy231) { - } else if !yym232 && z.IsJSONHandle() { - z.EncJSONMarshal(yy231) + } else if z.HasExtensions() && z.EncExt(yy236) { + } else if !yym237 && z.IsJSONHandle() { + z.EncJSONMarshal(yy236) } else { - z.EncFallback(yy231) + z.EncFallback(yy236) } } else { r.EncodeNil() } } else { - if yyq2[71] { + if yyq2[72] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("outOfDiskTransitionFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy233 := &x.OutOfDiskTransitionFrequency - yym234 := z.EncBinary() - _ = yym234 + yy238 := &x.OutOfDiskTransitionFrequency + yym239 := z.EncBinary() + _ = yym239 if false { - } else if z.HasExtensions() && z.EncExt(yy233) { - } else if !yym234 && z.IsJSONHandle() { - z.EncJSONMarshal(yy233) + } else if z.HasExtensions() && z.EncExt(yy238) { + } else if !yym239 && z.IsJSONHandle() { + z.EncJSONMarshal(yy238) } else { - z.EncFallback(yy233) + z.EncFallback(yy238) } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2[72] { - yym236 := z.EncBinary() - _ = yym236 + if yyq2[73] { + yym241 := z.EncBinary() + _ = yym241 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -2633,12 +2660,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2[72] { + if yyq2[73] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeIP")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym237 := z.EncBinary() - _ = yym237 + yym242 := z.EncBinary() + _ = yym242 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -2650,8 +2677,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym239 := z.EncBinary() - _ = yym239 + yym244 := z.EncBinary() + _ = yym244 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -2664,8 +2691,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym240 := z.EncBinary() - _ = yym240 + yym245 := z.EncBinary() + _ = yym245 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -2674,8 +2701,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym242 := z.EncBinary() - _ = yym242 + yym247 := z.EncBinary() + _ = yym247 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -2684,8 +2711,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nonMasqueradeCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym243 := z.EncBinary() - _ = yym243 + yym248 := z.EncBinary() + _ = yym248 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -2693,8 +2720,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym245 := z.EncBinary() - _ = yym245 + yym250 := z.EncBinary() + _ = yym250 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -2703,8 +2730,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableCustomMetrics")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym246 := z.EncBinary() - _ = yym246 + yym251 := z.EncBinary() + _ = yym251 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -3059,6 +3086,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode z.DecFallback(yyv47, false) } } + case "imageMinimumGCAge": + if r.TryDecodeAsNil() { + x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + } else { + yyv49 := &x.ImageMinimumGCAge + yym50 := z.DecBinary() + _ = yym50 + if false { + } else if z.HasExtensions() && z.DecExt(yyv49) { + } else if !yym50 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv49) + } else { + z.DecFallback(yyv49, false) + } + } case "imageGCHighThresholdPercent": if r.TryDecodeAsNil() { x.ImageGCHighThresholdPercent = 0 @@ -3081,15 +3123,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv52 := &x.VolumeStatsAggPeriod - yym53 := z.DecBinary() - _ = yym53 + yyv54 := &x.VolumeStatsAggPeriod + yym55 := z.DecBinary() + _ = yym55 if false { - } else if z.HasExtensions() && z.DecExt(yyv52) { - } else if !yym53 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv52) + } else if z.HasExtensions() && z.DecExt(yyv54) { + } else if !yym55 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv54) } else { - z.DecFallback(yyv52, false) + z.DecFallback(yyv54, false) } } case "networkPluginName": @@ -3264,15 +3306,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv82 := &x.OutOfDiskTransitionFrequency - yym83 := z.DecBinary() - _ = yym83 + yyv84 := &x.OutOfDiskTransitionFrequency + yym85 := z.DecBinary() + _ = yym85 if false { - } else if z.HasExtensions() && z.DecExt(yyv82) { - } else if !yym83 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv82) + } else if z.HasExtensions() && z.DecExt(yyv84) { + } else if !yym85 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv84) } else { - z.DecFallback(yyv82, false) + z.DecFallback(yyv84, false) } } case "nodeIP": @@ -3285,12 +3327,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv85 := &x.NodeLabels - yym86 := z.DecBinary() - _ = yym86 + yyv87 := &x.NodeLabels + yym88 := z.DecBinary() + _ = yym88 if false { } else { - z.F.DecMapStringStringX(yyv85, false, d) + z.F.DecMapStringStringX(yyv87, false, d) } } case "nonMasqueradeCIDR": @@ -3316,16 +3358,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj89 int - var yyb89 bool - var yyhl89 bool = l >= 0 - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + var yyj91 int + var yyb91 bool + var yyhl91 bool = l >= 0 + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3335,13 +3377,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Config = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3349,32 +3391,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv91 := &x.SyncFrequency - yym92 := z.DecBinary() - _ = yym92 - if false { - } else if z.HasExtensions() && z.DecExt(yyv91) { - } else if !yym92 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv91) - } else { - z.DecFallback(yyv91, false) - } - } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l - } else { - yyb89 = r.CheckBreak() - } - if yyb89 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} - } else { - yyv93 := &x.FileCheckFrequency + yyv93 := &x.SyncFrequency yym94 := z.DecBinary() _ = yym94 if false { @@ -3385,21 +3402,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv93, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv95 := &x.HTTPCheckFrequency + yyv95 := &x.FileCheckFrequency yym96 := z.DecBinary() _ = yym96 if false { @@ -3410,13 +3427,38 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv95, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + } else { + yyv97 := &x.HTTPCheckFrequency + yym98 := z.DecBinary() + _ = yym98 + if false { + } else if z.HasExtensions() && z.DecExt(yyv97) { + } else if !yym98 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv97) + } else { + z.DecFallback(yyv97, false) + } + } + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l + } else { + yyb91 = r.CheckBreak() + } + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3426,13 +3468,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3442,13 +3484,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3458,13 +3500,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3474,13 +3516,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3490,13 +3532,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3506,13 +3548,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3522,13 +3564,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3538,13 +3580,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3554,13 +3596,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3570,13 +3612,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3586,13 +3628,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3602,13 +3644,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3618,13 +3660,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3634,13 +3676,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3650,13 +3692,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostNetworkSources = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3666,13 +3708,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostPIDSources = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3682,13 +3724,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostIPCSources = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3698,13 +3740,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = float64(r.DecodeFloat(false)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3714,13 +3756,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3730,13 +3772,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = float32(r.DecodeFloat(true)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3746,13 +3788,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3762,13 +3804,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3776,24 +3818,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv119 := &x.MinimumGCAge - yym120 := z.DecBinary() - _ = yym120 + yyv121 := &x.MinimumGCAge + yym122 := z.DecBinary() + _ = yym122 if false { - } else if z.HasExtensions() && z.DecExt(yyv119) { - } else if !yym120 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv119) + } else if z.HasExtensions() && z.DecExt(yyv121) { + } else if !yym122 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv121) } else { - z.DecFallback(yyv119, false) + z.DecFallback(yyv121, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3803,13 +3845,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3819,13 +3861,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3835,13 +3877,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3851,13 +3893,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3867,13 +3909,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3883,13 +3925,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3899,13 +3941,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3915,13 +3957,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3931,13 +3973,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3947,13 +3989,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3961,32 +4003,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv131 := &x.StreamingConnectionIdleTimeout - yym132 := z.DecBinary() - _ = yym132 - if false { - } else if z.HasExtensions() && z.DecExt(yyv131) { - } else if !yym132 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv131) - } else { - z.DecFallback(yyv131, false) - } - } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l - } else { - yyb89 = r.CheckBreak() - } - if yyb89 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} - } else { - yyv133 := &x.NodeStatusUpdateFrequency + yyv133 := &x.StreamingConnectionIdleTimeout yym134 := z.DecBinary() _ = yym134 if false { @@ -3997,13 +4014,63 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv133, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + } else { + yyv135 := &x.NodeStatusUpdateFrequency + yym136 := z.DecBinary() + _ = yym136 + if false { + } else if z.HasExtensions() && z.DecExt(yyv135) { + } else if !yym136 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv135) + } else { + z.DecFallback(yyv135, false) + } + } + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l + } else { + yyb91 = r.CheckBreak() + } + if yyb91 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + } else { + yyv137 := &x.ImageMinimumGCAge + yym138 := z.DecBinary() + _ = yym138 + if false { + } else if z.HasExtensions() && z.DecExt(yyv137) { + } else if !yym138 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv137) + } else { + z.DecFallback(yyv137, false) + } + } + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l + } else { + yyb91 = r.CheckBreak() + } + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4013,13 +4080,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCHighThresholdPercent = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4029,13 +4096,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCLowThresholdPercent = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4045,13 +4112,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LowDiskSpaceThresholdMB = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4059,24 +4126,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv138 := &x.VolumeStatsAggPeriod - yym139 := z.DecBinary() - _ = yym139 + yyv142 := &x.VolumeStatsAggPeriod + yym143 := z.DecBinary() + _ = yym143 if false { - } else if z.HasExtensions() && z.DecExt(yyv138) { - } else if !yym139 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv138) + } else if z.HasExtensions() && z.DecExt(yyv142) { + } else if !yym143 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv142) } else { - z.DecFallback(yyv138, false) + z.DecFallback(yyv142, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4086,13 +4153,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4102,13 +4169,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4118,13 +4185,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4134,13 +4201,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4150,13 +4217,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4166,13 +4233,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeletCgroups = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4182,13 +4249,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RuntimeCgroups = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4198,13 +4265,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemCgroups = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4214,13 +4281,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4230,13 +4297,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4246,13 +4313,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4262,13 +4329,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LockFilePath = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4278,13 +4345,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4294,13 +4361,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ConfigureCBR0 = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4310,13 +4377,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HairpinMode = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4326,13 +4393,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4342,13 +4409,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4358,13 +4425,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4374,13 +4441,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4390,13 +4457,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4406,13 +4473,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4422,13 +4489,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = uint64(r.DecodeUint(64)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4438,13 +4505,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4454,13 +4521,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4470,13 +4537,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4486,13 +4553,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4502,13 +4569,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4518,13 +4585,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalFlannelOverlay = bool(r.DecodeBool()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4532,24 +4599,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv168 := &x.OutOfDiskTransitionFrequency - yym169 := z.DecBinary() - _ = yym169 + yyv172 := &x.OutOfDiskTransitionFrequency + yym173 := z.DecBinary() + _ = yym173 if false { - } else if z.HasExtensions() && z.DecExt(yyv168) { - } else if !yym169 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv168) + } else if z.HasExtensions() && z.DecExt(yyv172) { + } else if !yym173 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv172) } else { - z.DecFallback(yyv168, false) + z.DecFallback(yyv172, false) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4559,13 +4626,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4573,21 +4640,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv171 := &x.NodeLabels - yym172 := z.DecBinary() - _ = yym172 + yyv175 := &x.NodeLabels + yym176 := z.DecBinary() + _ = yym176 if false { } else { - z.F.DecMapStringStringX(yyv171, false, d) + z.F.DecMapStringStringX(yyv175, false, d) } } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4597,13 +4664,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4614,17 +4681,17 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.EnableCustomMetrics = bool(r.DecodeBool()) } for { - yyj89++ - if yyhl89 { - yyb89 = yyj89 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb89 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb89 { + if yyb91 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj89-1, "") + z.DecStructFieldNotFound(yyj91-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 3982ab7a6e3..5f15c7a4018 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -197,6 +197,9 @@ type KubeletConfiguration struct { // status to master. Note: be cautious when changing the constant, it // must work with nodeMonitorGracePeriod in nodecontroller. NodeStatusUpdateFrequency unversioned.Duration `json:"nodeStatusUpdateFrequency"` + // minimumGCAge is the minimum age for a unused image before it is + // garbage collected. + ImageMinimumGCAge unversioned.Duration `json:"imageMinimumGCAge"` // imageGCHighThresholdPercent is the percent of disk usage after which // image garbage collection is always run. ImageGCHighThresholdPercent int `json:"imageGCHighThresholdPercent"` diff --git a/pkg/kubelet/image_manager.go b/pkg/kubelet/image_manager.go index 96c15fac95b..9b0dc097952 100644 --- a/pkg/kubelet/image_manager.go +++ b/pkg/kubelet/image_manager.go @@ -32,10 +32,6 @@ import ( "k8s.io/kubernetes/pkg/util/wait" ) -const ( - defaultGCAge = time.Minute * 1 -) - // Manages lifecycle of all images. // // Implementation is thread-safe. @@ -62,6 +58,9 @@ type ImageGCPolicy struct { // Any usage below this threshold will never trigger garbage collection. // This is the lowest threshold we will try to garbage collect to. LowThresholdPercent int + + // Minimum age at which a image can be garbage collected. + MinAge time.Duration } type realImageManager struct { @@ -75,10 +74,6 @@ type realImageManager struct { // The image garbage collection policy in use. policy ImageGCPolicy - // Minimum age at which a image can be garbage collected, zero for no limit. - // TODO(mqliang): move it to ImageGCPolicy and make it configurable - minAge time.Duration - // cAdvisor instance. cadvisor cadvisor.Interface @@ -118,7 +113,6 @@ func newImageManager(runtime container.Runtime, cadvisorInterface cadvisor.Inter im := &realImageManager{ runtime: runtime, policy: policy, - minAge: defaultGCAge, imageRecords: make(map[string]*imageRecord), cadvisor: cadvisorInterface, recorder: recorder, @@ -279,7 +273,8 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in // Avoid garbage collect the image if the image is not old enough. // In such a case, the image may have just been pulled down, and will be used by a container right away. - if freeTime.Sub(image.firstDetected) < im.minAge { + + if freeTime.Sub(image.firstDetected) < im.policy.MinAge { continue } diff --git a/pkg/kubelet/image_manager_test.go b/pkg/kubelet/image_manager_test.go index b023475607e..369e65f943a 100644 --- a/pkg/kubelet/image_manager_test.go +++ b/pkg/kubelet/image_manager_test.go @@ -38,7 +38,6 @@ func newRealImageManager(policy ImageGCPolicy) (*realImageManager, *container.Fa return &realImageManager{ runtime: fakeRuntime, policy: policy, - minAge: 0, imageRecords: make(map[string]*imageRecord), cadvisor: mockCadvisor, recorder: &record.FakeRecorder{}, @@ -406,13 +405,13 @@ func TestGarbageCollectImageNotOldEnough(t *testing.T) { policy := ImageGCPolicy{ HighThresholdPercent: 90, LowThresholdPercent: 80, + MinAge: time.Minute * 1, } fakeRuntime := &container.FakeRuntime{} mockCadvisor := new(cadvisor.Mock) manager := &realImageManager{ runtime: fakeRuntime, policy: policy, - minAge: defaultGCAge, imageRecords: make(map[string]*imageRecord), cadvisor: mockCadvisor, recorder: &record.FakeRecorder{}, @@ -443,7 +442,7 @@ func TestGarbageCollectImageNotOldEnough(t *testing.T) { assert.Len(fakeRuntime.ImageList, 2) // move clock by minAge duration, then 1 image will be garbage collected - fakeClock.Step(manager.minAge) + fakeClock.Step(policy.MinAge) spaceFreed, err = manager.freeSpace(1024, fakeClock.Now()) require.NoError(t, err) assert.EqualValues(1024, spaceFreed)