Skip to content

Cleans up kubeadm default code and adds tests #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Apr 11, 2019
Merged

Cleans up kubeadm default code and adds tests #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkg/cloud/aws/services/ec2/instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ func (s *Service) createInstance(machine *actuators.MachineScope, bootstrapToken
if bootstrapToken != "" {
klog.V(2).Infof("Allowing machine %q to join control plane for cluster %q", machine.Name(), s.scope.Name())

machine.MachineConfig.KubeadmConfiguration.Join = kubeadm.SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken, machine, &machine.MachineConfig.KubeadmConfiguration.Join)
kubeadm.SetControlPlaneJoinConfigurationOverrides(&machine.MachineConfig.KubeadmConfiguration.Join)
joinConfigurationYAML, err := kubeadm.ConfigurationToYAML(&machine.MachineConfig.KubeadmConfiguration.Join)
updatedJoinConfiguration := kubeadm.SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken, machine, &machine.MachineConfig.KubeadmConfiguration.Join)
updatedJoinConfiguration = kubeadm.SetControlPlaneJoinConfigurationOverrides(updatedJoinConfiguration)
joinConfigurationYAML, err := kubeadm.ConfigurationToYAML(updatedJoinConfiguration)
if err != nil {
return nil, err
}
Expand All @@ -200,14 +200,14 @@ func (s *Service) createInstance(machine *actuators.MachineScope, bootstrapToken
)
}

kubeadm.SetClusterConfigurationOverrides(machine, &s.scope.ClusterConfig.ClusterConfiguration)
clusterConfigYAML, err := kubeadm.ConfigurationToYAML(&s.scope.ClusterConfig.ClusterConfiguration)
clusterConfiguration := kubeadm.SetClusterConfigurationOverrides(machine, &s.scope.ClusterConfig.ClusterConfiguration)
clusterConfigYAML, err := kubeadm.ConfigurationToYAML(clusterConfiguration)
if err != nil {
return nil, err
}

kubeadm.SetInitConfigurationOverrides(&machine.MachineConfig.KubeadmConfiguration.Init)
initConfigYAML, err := kubeadm.ConfigurationToYAML(&machine.MachineConfig.KubeadmConfiguration.Init)
initConfiguration := kubeadm.SetInitConfigurationOverrides(&machine.MachineConfig.KubeadmConfiguration.Init)
initConfigYAML, err := kubeadm.ConfigurationToYAML(initConfiguration)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -235,8 +235,8 @@ func (s *Service) createInstance(machine *actuators.MachineScope, bootstrapToken
case "node":
input.SecurityGroupIDs = append(input.SecurityGroupIDs, s.scope.SecurityGroups()[v1alpha1.SecurityGroupNode].ID)

kubeadm.SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken, machine, &machine.MachineConfig.KubeadmConfiguration.Join)
joinConfigurationYAML, err := kubeadm.ConfigurationToYAML(&machine.MachineConfig.KubeadmConfiguration.Join)
joinConfiguration := kubeadm.SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken, machine, &machine.MachineConfig.KubeadmConfiguration.Join)
joinConfigurationYAML, err := kubeadm.ConfigurationToYAML(joinConfiguration)
if err != nil {
return nil, err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/cloud/aws/services/kubeadm/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ go_test(
deps = [
"//pkg/apis/awsprovider/v1alpha1:go_default_library",
"//pkg/cloud/aws/actuators:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1:go_default_library",
"//vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1:go_default_library",
],
Expand Down
103 changes: 56 additions & 47 deletions pkg/cloud/aws/services/kubeadm/aws_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,102 +48,108 @@ const (
nodeRole = "node-role.kubernetes.io/node="
)

// joinMachine is a local interface to scope down dependencies
type joinMachine interface {
GetScope() *actuators.Scope
GetMachine() *v1alpha1.Machine
}

// SetDefaultClusterConfiguration sets default dynamic values without overriding
// user specified values.
func SetDefaultClusterConfiguration(machine *actuators.MachineScope, base *kubeadmv1beta1.ClusterConfiguration) {
func SetDefaultClusterConfiguration(machine joinMachine, base *kubeadmv1beta1.ClusterConfiguration) *kubeadmv1beta1.ClusterConfiguration {
if base == nil {
base = &kubeadmv1beta1.ClusterConfiguration{}
}
s := machine.Scope
out := base.DeepCopy()

s := machine.GetScope()

// Only set the control plane endpoint if the user hasn't specified one.
if base.ControlPlaneEndpoint == "" {
base.ControlPlaneEndpoint = fmt.Sprintf("%s:%d", s.Network().APIServerELB.DNSName, APIServerBindPort)
if out.ControlPlaneEndpoint == "" {
out.ControlPlaneEndpoint = fmt.Sprintf("%s:%d", s.Network().APIServerELB.DNSName, APIServerBindPort)
}
// Add the control plane endpoint to the list of cert SAN
base.APIServer.CertSANs = append(base.APIServer.CertSANs, localIPV4Lookup, s.Network().APIServerELB.DNSName)
out.APIServer.CertSANs = append(out.APIServer.CertSANs, localIPV4Lookup, s.Network().APIServerELB.DNSName)
return out
}

// SetClusterConfigurationOverrides will modify the supplied configuration with certain values
// that cluster-api-provider-aws requires overriding user specified input.
func SetClusterConfigurationOverrides(machine *actuators.MachineScope, base *kubeadmv1beta1.ClusterConfiguration) {
func SetClusterConfigurationOverrides(machine joinMachine, base *kubeadmv1beta1.ClusterConfiguration) *kubeadmv1beta1.ClusterConfiguration {
if base == nil {
base = &kubeadmv1beta1.ClusterConfiguration{}
}
s := machine.Scope
s := machine.GetScope()

SetDefaultClusterConfiguration(machine, base)
out := SetDefaultClusterConfiguration(machine, base.DeepCopy())

// cloud-provider for the APIServer must be set to 'aws'.
if base.APIServer.ControlPlaneComponent.ExtraArgs == nil {
base.APIServer.ControlPlaneComponent.ExtraArgs = map[string]string{}
if out.APIServer.ControlPlaneComponent.ExtraArgs == nil {
out.APIServer.ControlPlaneComponent.ExtraArgs = map[string]string{}
}
if cp, ok := base.APIServer.ControlPlaneComponent.ExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
if cp, ok := out.APIServer.ControlPlaneComponent.ExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
klog.Infof("Overriding cloud provider %q with required value %q", cp, CloudProvider)
}
base.APIServer.ControlPlaneComponent.ExtraArgs["cloud-provider"] = CloudProvider
out.APIServer.ControlPlaneComponent.ExtraArgs["cloud-provider"] = CloudProvider

if base.ControllerManager.ExtraArgs == nil {
base.ControllerManager.ExtraArgs = map[string]string{}
if out.ControllerManager.ExtraArgs == nil {
out.ControllerManager.ExtraArgs = map[string]string{}
}
if cp, ok := base.ControllerManager.ExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
if cp, ok := out.ControllerManager.ExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
klog.Infof("Overriding cloud provider %q with required value %q", cp, CloudProvider)
}
base.ControllerManager.ExtraArgs["cloud-provider"] = CloudProvider
out.ControllerManager.ExtraArgs["cloud-provider"] = CloudProvider

// The kubeadm config clustername must match the provided name of the cluster.
if base.ClusterName != "" && base.ClusterName != s.Name() {
klog.Infof("Overriding provided cluster name %q with %q. The kubeadm cluster name and cluster-api name must match.", base.ClusterName, s.Name())
if out.ClusterName != "" && out.ClusterName != s.Name() {
klog.Infof("Overriding provided cluster name %q with %q. The kubeadm cluster name and cluster-api name must match.", out.ClusterName, s.Name())
}
base.ClusterName = s.Name()
out.ClusterName = s.Name()

// The networking values provided by the Cluster object must equal the
// kubeadm networking configuration.
base.Networking.DNSDomain = s.Cluster.Spec.ClusterNetwork.ServiceDomain
base.Networking.PodSubnet = s.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks[0]
base.Networking.ServiceSubnet = s.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks[0]
out.Networking.DNSDomain = s.Cluster.Spec.ClusterNetwork.ServiceDomain
out.Networking.PodSubnet = s.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks[0]
out.Networking.ServiceSubnet = s.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks[0]

// The kubernetes version that kubeadm is using must be the same as the
// requested version in the config
base.KubernetesVersion = machine.Machine.Spec.Versions.ControlPlane
out.KubernetesVersion = machine.GetMachine().Spec.Versions.ControlPlane
return out
}

// SetInitConfigurationOverrides overrides user input on particular fields for
// the kubeadm InitConfiguration.
func SetInitConfigurationOverrides(base *kubeadmv1beta1.InitConfiguration) {
func SetInitConfigurationOverrides(base *kubeadmv1beta1.InitConfiguration) *kubeadmv1beta1.InitConfiguration {
if base == nil {
base = &kubeadmv1beta1.InitConfiguration{}
}
out := base.DeepCopy()

if base.NodeRegistration.Name != "" && base.NodeRegistration.Name != HostnameLookup {
klog.Infof("Overriding NodeRegistration name from %q to %q. The node registration needs to be dynamically generated in aws.", base.NodeRegistration.Name, HostnameLookup)
if out.NodeRegistration.Name != "" && out.NodeRegistration.Name != HostnameLookup {
klog.Infof("Overriding NodeRegistration name from %q to %q. The node registration needs to be dynamically generated in aws.", out.NodeRegistration.Name, HostnameLookup)
}
base.NodeRegistration.Name = HostnameLookup
out.NodeRegistration.Name = HostnameLookup

// TODO(chuckha): This may become a default instead of an override.
if base.NodeRegistration.CRISocket != "" && base.NodeRegistration.CRISocket != ContainerdSocket {
klog.Infof("Overriding CRISocket from %q to %q. Containerd is only supported container runtime.", base.NodeRegistration.CRISocket, ContainerdSocket)
if out.NodeRegistration.CRISocket != "" && out.NodeRegistration.CRISocket != ContainerdSocket {
klog.Infof("Overriding CRISocket from %q to %q. Containerd is only supported container runtime.", out.NodeRegistration.CRISocket, ContainerdSocket)
}
base.NodeRegistration.CRISocket = ContainerdSocket
out.NodeRegistration.CRISocket = ContainerdSocket

if base.NodeRegistration.KubeletExtraArgs == nil {
base.NodeRegistration.KubeletExtraArgs = map[string]string{}
if out.NodeRegistration.KubeletExtraArgs == nil {
out.NodeRegistration.KubeletExtraArgs = map[string]string{}
}
if cp, ok := base.NodeRegistration.KubeletExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
if cp, ok := out.NodeRegistration.KubeletExtraArgs["cloud-provider"]; ok && cp != CloudProvider {
klog.Infof("Overriding node's cloud-provider to the required value of %q.", CloudProvider)
}
base.NodeRegistration.KubeletExtraArgs["cloud-provider"] = CloudProvider
}

// joinMachine is a local interface scoping down exactly what SetJoinNodeConfigurationOverrides needs
type joinMachine interface {
GetScope() *actuators.Scope
GetMachine() *v1alpha1.Machine
out.NodeRegistration.KubeletExtraArgs["cloud-provider"] = CloudProvider
return out
}

// SetJoinNodeConfigurationOverrides overrides user input for certain fields of
// the kubeadm JoinConfiguration during a worker node join.
func SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken string, machine joinMachine, base *kubeadmv1beta1.JoinConfiguration) kubeadmv1beta1.JoinConfiguration {
func SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken string, machine joinMachine, base *kubeadmv1beta1.JoinConfiguration) *kubeadmv1beta1.JoinConfiguration {
if base == nil {
base = &kubeadmv1beta1.JoinConfiguration{}
}
Expand Down Expand Up @@ -178,18 +184,21 @@ func SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken string, machin
if !util.IsControlPlaneMachine(machine.GetMachine()) {
out.NodeRegistration.KubeletExtraArgs["node-labels"] = nodeRole
}
return *out
return out
}

// SetControlPlaneJoinConfigurationOverrides user input for kubeadm join
// configuration during a control plane join action.
func SetControlPlaneJoinConfigurationOverrides(base *kubeadmv1beta1.JoinConfiguration) {
func SetControlPlaneJoinConfigurationOverrides(base *kubeadmv1beta1.JoinConfiguration) *kubeadmv1beta1.JoinConfiguration {
if base == nil {
base = &kubeadmv1beta1.JoinConfiguration{}
}
if base.ControlPlane == nil {
base.ControlPlane = &kubeadmv1beta1.JoinControlPlane{}
out := base.DeepCopy()

if out.ControlPlane == nil {
out.ControlPlane = &kubeadmv1beta1.JoinControlPlane{}
}
base.ControlPlane.LocalAPIEndpoint.AdvertiseAddress = localIPV4Lookup
base.ControlPlane.LocalAPIEndpoint.BindPort = APIServerBindPort
out.ControlPlane.LocalAPIEndpoint.AdvertiseAddress = localIPV4Lookup
out.ControlPlane.LocalAPIEndpoint.BindPort = APIServerBindPort
return out
}
Loading