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

Replace deprecated flags: address -> insecure-bind-address

This commit is contained in:
Justin Santa Barbara 2018-05-31 13:05:47 -07:00
parent 0e4f28def6
commit 53bf6ea6ad
6 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
// InsecurePort is the port the insecure api runs
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"`
// 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
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

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

@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
// InsecurePort is the port the insecure api runs
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"`
// 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
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

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

@ -1931,6 +1931,8 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.SecurePort = in.SecurePort
out.InsecurePort = in.InsecurePort
out.Address = in.Address
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
@ -1997,6 +1999,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.SecurePort = in.SecurePort
out.InsecurePort = in.InsecurePort
out.Address = in.Address
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins

6
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -208,8 +208,12 @@ type KubeAPIServerConfig struct {
SecurePort int32 `json:"securePort,omitempty" flag:"secure-port"`
// InsecurePort is the port the insecure api runs
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"`
// 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
AdmissionControl []string `json:"admissionControl,omitempty" flag:"admission-control"`
// EnableAdmissionPlugins is a list of enabled admission plugins

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

@ -2195,6 +2195,8 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.SecurePort = in.SecurePort
out.InsecurePort = in.InsecurePort
out.Address = in.Address
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins
@ -2261,6 +2263,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.SecurePort = in.SecurePort
out.InsecurePort = in.InsecurePort
out.Address = in.Address
out.BindAddress = in.BindAddress
out.InsecureBindAddress = in.InsecureBindAddress
out.AdmissionControl = in.AdmissionControl
out.EnableAdmissionPlugins = in.EnableAdmissionPlugins
out.DisableAdmissionPlugins = in.DisableAdmissionPlugins

7
pkg/model/components/apiserver.go
View File

@ -161,7 +161,14 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
c.LogLevel = 2
c.SecurePort = 443
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.ServiceClusterIPRange = clusterSpec.ServiceClusterIPRange
c.EtcdServers = []string{"http://127.0.0.1:4001"}