Merge pull request #1083 from vjm/master

Add KubeletPreferredAddressTypes

docs/arguments.md

@@ -54,3 +54,20 @@ Values:
 ## out
 
 `out` determines the directory into which kubectl will write the target output.  It defaults to `out/terraform`
+
+# YAML-only Arguments
+
+Certain arguments can only be passed via YAML, eg, `kops edit cluster`. The following documents some of the more interesting or lesser-known options.
+
+## kubeletPreferredAddressTypes
+
+The apiserver can now select which type of kubelet-reported address to use for apiserver->node communications, using the --kubelet-preferred-address-types flag. (https://github.com/kubernetes/kubernetes/pull/35497, @liggitt)
+
+Example:
+
+```
+kubeAPIServer:
+	kubeletPreferredAddressTypes:
+	- InternalIP
+	- ExternalIP
+```

pkg/apis/kops/componentconfig.go

@@ -380,6 +380,8 @@ type KubeAPIServerConfig struct {
 	RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"`
 
 	AnonymousAuth *bool `json:"anonymousAuth,omitempty" flag:"anonymous-auth"`
+
+	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 }
 
 type KubeControllerManagerConfig struct {

pkg/apis/kops/v1alpha1/componentconfig.go

@@ -377,6 +377,8 @@ type KubeAPIServerConfig struct {
 	RuntimeConfig         map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"`
 
 	AnonymousAuth *bool `json:"anonymousAuth,omitempty" flag:"anonymous-auth"`
+
+	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 }
 
 type KubeControllerManagerConfig struct {

pkg/apis/kops/v1alpha1/zz_generated.conversion.go

@@ -199,8 +199,7 @@ func autoConvert_v1alpha1_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
 	if in.Topology != nil {
 		in, out := &in.Topology, &out.Topology
 		*out = new(kops.TopologySpec)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
+		if err := Convert_v1alpha1_TopologySpec_To_kops_TopologySpec(*in, *out, s); err != nil {
 			return err
 		}
 	} else {
@@ -327,8 +326,7 @@ func autoConvert_kops_ClusterSpec_To_v1alpha1_ClusterSpec(in *kops.ClusterSpec,
 	if in.Topology != nil {
 		in, out := &in.Topology, &out.Topology
 		*out = new(TopologySpec)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
+		if err := Convert_kops_TopologySpec_To_v1alpha1_TopologySpec(*in, *out, s); err != nil {
 			return err
 		}
 	} else {
@@ -449,6 +447,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
 	out.Storage = in.Storage
 	out.InsecureRegistry = in.InsecureRegistry
 	out.MTU = in.MTU
+	out.Version = in.Version
 	return nil
 }
 
@@ -464,6 +463,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
 	out.Storage = in.Storage
 	out.InsecureRegistry = in.InsecureRegistry
 	out.MTU = in.MTU
+	out.Version = in.Version
 	return nil
 }
 
@@ -767,6 +767,8 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
 	out.AllowPrivileged = in.AllowPrivileged
 	out.APIServerCount = in.APIServerCount
 	out.RuntimeConfig = in.RuntimeConfig
+	out.AnonymousAuth = in.AnonymousAuth
+	out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
 	return nil
 }
 
@@ -794,6 +796,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
 	out.AllowPrivileged = in.AllowPrivileged
 	out.APIServerCount = in.APIServerCount
 	out.RuntimeConfig = in.RuntimeConfig
+	out.AnonymousAuth = in.AnonymousAuth
+	out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
 	return nil
 }
 

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -133,6 +133,10 @@ type KubeAPIServerConfig struct {
 	// for KubeAPIServer, concatenated with commas. ex: `--runtime-config=key1=value1,key2=value2`.
 	// Use this to enable alpha resources on kube-apiserver
 	RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"`
+
+	AnonymousAuth *bool `json:"anonymousAuth,omitempty" flag:"anonymous-auth"`
+
+	KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
 }
 
 type KubeControllerManagerConfig struct {