Skip to content

Commit

Permalink
Fix cluster DNS IP format in Bottlerocket userdata (#1389)
Browse files Browse the repository at this point in the history
* Fix cluster DNS format in Bottlerocket userdata

Bottlerocket, like AL2, also only supports a single cluster DNS IP. This
change matches Bottlerocket behavior to the existing AL2 one.

* Fix condition for Bottlerocket DNS settings

Co-authored-by: Brandon Wagner <bmwagner10@gmail.com>

* Fix file formatting

Co-authored-by: Brandon Wagner <bmwagner10@gmail.com>
  • Loading branch information
mKeRix and bwagner5 committed Feb 22, 2022
1 parent 9f05c0d commit 6ea0776
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/cloudprovider/aws/launchtemplate.go
Expand Up @@ -288,8 +288,8 @@ func (p *LaunchTemplateProvider) getUserData(ctx context.Context, constraints *v

func (p *LaunchTemplateProvider) getBottlerocketUserData(ctx context.Context, constraints *v1alpha1.Constraints, additionalLabels map[string]string, caBundle *string) string {
userData := fmt.Sprintf("[settings.kubernetes]\ncluster-name = \"%s\"\napi-server = \"%s\"\n", injection.GetOptions(ctx).ClusterName, injection.GetOptions(ctx).ClusterEndpoint)
if constraints.KubeletConfiguration.ClusterDNS != nil {
userData += fmt.Sprintf("cluster-dns-ip = \"%s\"\n", constraints.KubeletConfiguration.ClusterDNS)
if len(constraints.KubeletConfiguration.ClusterDNS) > 0 {
userData += fmt.Sprintf("cluster-dns-ip = \"%s\"\n", constraints.KubeletConfiguration.ClusterDNS[0])
}
if caBundle != nil {
userData += fmt.Sprintf("cluster-certificate = \"%s\"\n", *caBundle)
Expand Down

0 comments on commit 6ea0776

Please sign in to comment.