kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Config is deprecated, use PodManifestPath

This commit is contained in:
Michael Taufen 2017-01-30 10:56:08 -08:00
parent b5f6ba3488
commit bc615ae923
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/componentconfig.go
View File

@ -26,7 +26,7 @@ type KubeletConfigSpec struct {
// Configuration flags - a subset of https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go // Configuration flags - a subset of https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go
// config is the path to the config file or directory of files // config is the path to the config file or directory of files
Config string `json:"config,omitempty" flag:"config"` PodManifestPath string `json:"podManifestPath,omitempty" flag:"pod-manifest-path"`
//// syncFrequency is the max period between synchronizing running //// syncFrequency is the max period between synchronizing running
//// containers and config //// containers and config
//SyncFrequency unversioned.Duration `json:"syncFrequency"` //SyncFrequency unversioned.Duration `json:"syncFrequency"`

2
pkg/apis/kops/v1alpha1/componentconfig.go
View File

@ -26,7 +26,7 @@ type KubeletConfigSpec struct {
// Configuration flags - a subset of https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go // Configuration flags - a subset of https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go
// config is the path to the config file or directory of files // config is the path to the config file or directory of files
Config string `json:"config,omitempty" flag:"config"` PodManifestPath string `json:"podManifestPath,omitempty" flag:"pod-manifest-path"`
//// syncFrequency is the max period between synchronizing running //// syncFrequency is the max period between synchronizing running
//// containers and config //// containers and config
//SyncFrequency unversioned.Duration `json:"syncFrequency"` //SyncFrequency unversioned.Duration `json:"syncFrequency"`

4
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -1159,7 +1159,7 @@ func Convert_kops_KubeSchedulerConfig_To_v1alpha1_KubeSchedulerConfig(in *kops.K
func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *KubeletConfigSpec, out *kops.KubeletConfigSpec, s conversion.Scope) error { func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *KubeletConfigSpec, out *kops.KubeletConfigSpec, s conversion.Scope) error {
out.APIServers = in.APIServers out.APIServers = in.APIServers
out.LogLevel = in.LogLevel out.LogLevel = in.LogLevel
out.Config = in.Config out.PodManifestPath = in.PodManifestPath
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.AllowPrivileged = in.AllowPrivileged out.AllowPrivileged = in.AllowPrivileged
out.EnableDebuggingHandlers = in.EnableDebuggingHandlers out.EnableDebuggingHandlers = in.EnableDebuggingHandlers
@ -1195,7 +1195,7 @@ func Convert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *KubeletCon
func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.KubeletConfigSpec, out *KubeletConfigSpec, s conversion.Scope) error { func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.KubeletConfigSpec, out *KubeletConfigSpec, s conversion.Scope) error {
out.APIServers = in.APIServers out.APIServers = in.APIServers
out.LogLevel = in.LogLevel out.LogLevel = in.LogLevel
out.Config = in.Config out.PodManifestPath = in.PodManifestPath
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.AllowPrivileged = in.AllowPrivileged out.AllowPrivileged = in.AllowPrivileged
out.EnableDebuggingHandlers = in.EnableDebuggingHandlers out.EnableDebuggingHandlers = in.EnableDebuggingHandlers

2
upup/models/config/components/kubelet/kubelet.options
View File

@ -1,6 +1,6 @@
Kubelet: Kubelet:
EnableDebuggingHandlers: true EnableDebuggingHandlers: true
Config: /etc/kubernetes/manifests PodManifestPath: /etc/kubernetes/manifests
AllowPrivileged: true AllowPrivileged: true
LogLevel: 2 LogLevel: 2
ClusterDNS: {{ WellKnownServiceIP 10 }} ClusterDNS: {{ WellKnownServiceIP 10 }}