diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 63e2a85126..f2046a605f 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -443,7 +443,7 @@ func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string { annotations := make(map[string]string) if b.Cluster.Spec.API != nil { - if b.Cluster.Spec.API.LoadBalancer == nil || b.Cluster.Spec.API.LoadBalancer.UseApiInternal != true { + if b.Cluster.Spec.API.LoadBalancer == nil || b.Cluster.Spec.API.LoadBalancer.UseForInternalApi != true { annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.Spec.MasterInternalName } diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index d9e747b974..33a2c3501f 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -286,7 +286,7 @@ type LoadBalancerAccessSpec struct { Type LoadBalancerType `json:"type,omitempty"` IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` - UseApiInternal bool `json:"useApiInternal,omitempty"` + UseForInternalApi bool `json:"useForInternalApi,omitempty"` } // KubeDNSConfig defines the kube dns configuration diff --git a/pkg/apis/kops/v1alpha1/cluster.go b/pkg/apis/kops/v1alpha1/cluster.go index e175fcea3a..bb228b9604 100644 --- a/pkg/apis/kops/v1alpha1/cluster.go +++ b/pkg/apis/kops/v1alpha1/cluster.go @@ -285,6 +285,7 @@ type LoadBalancerAccessSpec struct { Type LoadBalancerType `json:"type,omitempty"` IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` + UseForInternalApi bool `json:"useForInternalApi,omitempty"` } // KubeDNSConfig defines the kube dns configuration diff --git a/pkg/apis/kops/v1alpha1/conversion.go b/pkg/apis/kops/v1alpha1/conversion.go index bc9b2573f4..e5322412f3 100644 --- a/pkg/apis/kops/v1alpha1/conversion.go +++ b/pkg/apis/kops/v1alpha1/conversion.go @@ -301,11 +301,3 @@ func Convert_kops_TopologySpec_To_v1alpha1_TopologySpec(in *kops.TopologySpec, o } return nil } - -func Convert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec(in *kops.LoadBalancerAccessSpec, out *LoadBalancerAccessSpec, s conversion.Scope) error { - out.Type = LoadBalancerType(in.Type) - out.IdleTimeoutSeconds = in.IdleTimeoutSeconds - out.AdditionalSecurityGroups = in.AdditionalSecurityGroups - - return nil -} diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index da8a0b907b..bda5d4253a 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -2650,6 +2650,7 @@ func autoConvert_v1alpha1_LoadBalancerAccessSpec_To_kops_LoadBalancerAccessSpec( out.Type = kops.LoadBalancerType(in.Type) out.IdleTimeoutSeconds = in.IdleTimeoutSeconds out.AdditionalSecurityGroups = in.AdditionalSecurityGroups + out.UseForInternalApi = in.UseForInternalApi return nil } @@ -2662,10 +2663,15 @@ func autoConvert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec( out.Type = LoadBalancerType(in.Type) out.IdleTimeoutSeconds = in.IdleTimeoutSeconds out.AdditionalSecurityGroups = in.AdditionalSecurityGroups - // WARNING: in.UseApiInternal requires manual conversion: does not exist in peer-type + out.UseForInternalApi = in.UseForInternalApi return nil } +// Convert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec is an autogenerated conversion function. +func Convert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec(in *kops.LoadBalancerAccessSpec, out *LoadBalancerAccessSpec, s conversion.Scope) error { + return autoConvert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec(in, out, s) +} + func autoConvert_v1alpha1_NetworkingSpec_To_kops_NetworkingSpec(in *NetworkingSpec, out *kops.NetworkingSpec, s conversion.Scope) error { if in.Classic != nil { in, out := &in.Classic, &out.Classic diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go index a65fdbe980..3d01345a3f 100644 --- a/pkg/apis/kops/v1alpha2/cluster.go +++ b/pkg/apis/kops/v1alpha2/cluster.go @@ -286,7 +286,7 @@ type LoadBalancerAccessSpec struct { Type LoadBalancerType `json:"type,omitempty"` IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` - UseApiInternal bool `json:"useApiInternal,omitempty"` + UseForInternalApi bool `json:"useForInternalApi,omitempty"` } // KubeDNSConfig defines the kube dns configuration diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index e62f69b1ab..6d5179e31c 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2914,7 +2914,7 @@ func autoConvert_v1alpha2_LoadBalancerAccessSpec_To_kops_LoadBalancerAccessSpec( out.Type = kops.LoadBalancerType(in.Type) out.IdleTimeoutSeconds = in.IdleTimeoutSeconds out.AdditionalSecurityGroups = in.AdditionalSecurityGroups - out.UseApiInternal = in.UseApiInternal + out.UseForInternalApi = in.UseForInternalApi return nil } @@ -2927,7 +2927,7 @@ func autoConvert_kops_LoadBalancerAccessSpec_To_v1alpha2_LoadBalancerAccessSpec( out.Type = LoadBalancerType(in.Type) out.IdleTimeoutSeconds = in.IdleTimeoutSeconds out.AdditionalSecurityGroups = in.AdditionalSecurityGroups - out.UseApiInternal = in.UseApiInternal + out.UseForInternalApi = in.UseForInternalApi return nil } diff --git a/pkg/model/context.go b/pkg/model/context.go index d3260d6bfd..4acf0859bd 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -290,7 +290,7 @@ func (m *KopsModelContext) UseLoadBalancerForAPI() bool { // HA - see https://github.com/kubernetes/kops/issues/4252 func (m *KopsModelContext) UseLoadBalancerForInternalAPI() bool { return m.UseLoadBalancerForAPI() && - m.Cluster.Spec.API.LoadBalancer.UseApiInternal == true + m.Cluster.Spec.API.LoadBalancer.UseForInternalApi == true } // UsePrivateDNS checks if we are using private DNS