mirror of https://github.com/kubernetes/kops.git
Replace deprecated flags: address -> insecure-bind-address
This commit is contained in:
parent
0e4f28def6
commit
53bf6ea6ad
|
@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
|
||||||
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
||||||
// InsecurePort is the port the insecure api runs
|
// InsecurePort is the port the insecure api runs
|
||||||
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
||||||
// Address is the binding address for the kube api
|
// Address is the binding address for the kube api: Deprecated - use insecure-bind-address and bind-address
|
||||||
Address string `json:"address,omitempty" flag:"address"`
|
Address string `json:"address,omitempty" flag:"address"`
|
||||||
|
// BindAddress is the binding address for the secure kubernetes API
|
||||||
|
BindAddress string `json:"bindAddress,omitempty" flag:"bind-address"`
|
||||||
|
// InsecureBindAddress is the binding address for the InsecurePort for the insecure kubernetes API
|
||||||
|
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
|
||||||
// Deprecated: AdmissionControl is a list of admission controllers to use
|
// Deprecated: AdmissionControl is a list of admission controllers to use
|
||||||
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
||||||
// EnableAdmissionPlugins is a list of enabled admission plugins
|
// EnableAdmissionPlugins is a list of enabled admission plugins
|
||||||
|
|
|
@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
|
||||||
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
||||||
// InsecurePort is the port the insecure api runs
|
// InsecurePort is the port the insecure api runs
|
||||||
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
||||||
// Address is the binding address for the kube api
|
// Address is the binding address for the kube api: Deprecated - use insecure-bind-address and bind-address
|
||||||
Address string `json:"address,omitempty" flag:"address"`
|
Address string `json:"address,omitempty" flag:"address"`
|
||||||
|
// BindAddress is the binding address for the secure kubernetes API
|
||||||
|
BindAddress string `json:"bindAddress,omitempty" flag:"bind-address"`
|
||||||
|
// InsecureBindAddress is the binding address for the InsecurePort for the insecure kubernetes API
|
||||||
|
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
|
||||||
// Deprecated: AdmissionControl is a list of admission controllers to use
|
// Deprecated: AdmissionControl is a list of admission controllers to use
|
||||||
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
||||||
// EnableAdmissionPlugins is a list of enabled admission plugins
|
// EnableAdmissionPlugins is a list of enabled admission plugins
|
||||||
|
|
|
@ -1931,6 +1931,8 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
|
||||||
out.SecurePort = in.SecurePort
|
out.SecurePort = in.SecurePort
|
||||||
out.InsecurePort = in.InsecurePort
|
out.InsecurePort = in.InsecurePort
|
||||||
out.Address = in.Address
|
out.Address = in.Address
|
||||||
|
out.BindAddress = in.BindAddress
|
||||||
|
out.InsecureBindAddress = in.InsecureBindAddress
|
||||||
out.AdmissionControl = in.AdmissionControl
|
out.AdmissionControl = in.AdmissionControl
|
||||||
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
||||||
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
||||||
|
@ -1997,6 +1999,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
|
||||||
out.SecurePort = in.SecurePort
|
out.SecurePort = in.SecurePort
|
||||||
out.InsecurePort = in.InsecurePort
|
out.InsecurePort = in.InsecurePort
|
||||||
out.Address = in.Address
|
out.Address = in.Address
|
||||||
|
out.BindAddress = in.BindAddress
|
||||||
|
out.InsecureBindAddress = in.InsecureBindAddress
|
||||||
out.AdmissionControl = in.AdmissionControl
|
out.AdmissionControl = in.AdmissionControl
|
||||||
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
||||||
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
||||||
|
|
|
@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
|
||||||
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
|
||||||
// InsecurePort is the port the insecure api runs
|
// InsecurePort is the port the insecure api runs
|
||||||
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
InsecurePort int32 `json:"insecurePort,omitempty" flag:"insecure-port"`
|
||||||
// Address is the binding address for the kube api
|
// Address is the binding address for the kube api: Deprecated - use insecure-bind-address and bind-address
|
||||||
Address string `json:"address,omitempty" flag:"address"`
|
Address string `json:"address,omitempty" flag:"address"`
|
||||||
|
// BindAddress is the binding address for the secure kubernetes API
|
||||||
|
BindAddress string `json:"bindAddress,omitempty" flag:"bind-address"`
|
||||||
|
// InsecureBindAddress is the binding address for the InsecurePort for the insecure kubernetes API
|
||||||
|
InsecureBindAddress string `json:"insecureBindAddress,omitempty" flag:"insecure-bind-address"`
|
||||||
// Deprecated: AdmissionControl is a list of admission controllers to use
|
// Deprecated: AdmissionControl is a list of admission controllers to use
|
||||||
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
|
||||||
// EnableAdmissionPlugins is a list of enabled admission plugins
|
// EnableAdmissionPlugins is a list of enabled admission plugins
|
||||||
|
|
|
@ -2195,6 +2195,8 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
|
||||||
out.SecurePort = in.SecurePort
|
out.SecurePort = in.SecurePort
|
||||||
out.InsecurePort = in.InsecurePort
|
out.InsecurePort = in.InsecurePort
|
||||||
out.Address = in.Address
|
out.Address = in.Address
|
||||||
|
out.BindAddress = in.BindAddress
|
||||||
|
out.InsecureBindAddress = in.InsecureBindAddress
|
||||||
out.AdmissionControl = in.AdmissionControl
|
out.AdmissionControl = in.AdmissionControl
|
||||||
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
||||||
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
||||||
|
@ -2261,6 +2263,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
|
||||||
out.SecurePort = in.SecurePort
|
out.SecurePort = in.SecurePort
|
||||||
out.InsecurePort = in.InsecurePort
|
out.InsecurePort = in.InsecurePort
|
||||||
out.Address = in.Address
|
out.Address = in.Address
|
||||||
|
out.BindAddress = in.BindAddress
|
||||||
|
out.InsecureBindAddress = in.InsecureBindAddress
|
||||||
out.AdmissionControl = in.AdmissionControl
|
out.AdmissionControl = in.AdmissionControl
|
||||||
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
|
||||||
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
|
||||||
|
|
|
@ -161,7 +161,14 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
|
||||||
|
|
||||||
c.LogLevel = 2
|
c.LogLevel = 2
|
||||||
c.SecurePort = 443
|
c.SecurePort = 443
|
||||||
c.Address = "127.0.0.1"
|
|
||||||
|
if b.IsKubernetesGTE("1.10") {
|
||||||
|
c.BindAddress = "0.0.0.0"
|
||||||
|
c.InsecureBindAddress = "127.0.0.1"
|
||||||
|
} else {
|
||||||
|
c.Address = "127.0.0.1"
|
||||||
|
}
|
||||||
|
|
||||||
c.AllowPrivileged = fi.Bool(true)
|
c.AllowPrivileged = fi.Bool(true)
|
||||||
c.ServiceClusterIPRange = clusterSpec.ServiceClusterIPRange
|
c.ServiceClusterIPRange = clusterSpec.ServiceClusterIPRange
|
||||||
c.EtcdServers = []string{"http://127.0.0.1:4001"}
|
c.EtcdServers = []string{"http://127.0.0.1:4001"}
|
||||||
|
|
Loading…
Reference in New Issue