From 158a8c8951c54221ff6f674dfcadfb03b4398ff8 Mon Sep 17 00:00:00 2001 From: Brandon Wagner Date: Fri, 23 Jun 2023 16:57:50 -0500 Subject: [PATCH] chore: add bottlerocket cloud-provider config (#4121) --- pkg/providers/amifamily/bootstrap/bottlerocketsettings.go | 1 + pkg/providers/launchtemplate/testdata/br_userdata_input.golden | 1 + pkg/providers/launchtemplate/testdata/br_userdata_merged.golden | 1 + 3 files changed, 3 insertions(+) diff --git a/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go b/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go index 2624c38a53f5..426989c2757a 100644 --- a/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go +++ b/pkg/providers/amifamily/bootstrap/bottlerocketsettings.go @@ -44,6 +44,7 @@ type BottlerocketSettings struct { // BottlerocketKubernetes is k8s specific configuration for bottlerocket api type BottlerocketKubernetes struct { APIServer *string `toml:"api-server"` + CloudProvider *string `toml:"cloud-provider"` ClusterCertificate *string `toml:"cluster-certificate"` ClusterName *string `toml:"cluster-name"` ClusterDNSIP *string `toml:"cluster-dns-ip,omitempty"` diff --git a/pkg/providers/launchtemplate/testdata/br_userdata_input.golden b/pkg/providers/launchtemplate/testdata/br_userdata_input.golden index 3d673d59fb70..cdecd466b0f9 100644 --- a/pkg/providers/launchtemplate/testdata/br_userdata_input.golden +++ b/pkg/providers/launchtemplate/testdata/br_userdata_input.golden @@ -1,6 +1,7 @@ [settings.kubernetes] "unknown-setting" = "unknown" api-server = 'replaceme' +cloud-provider = 'external' cluster-certificate = "replaceme" cluster-name = 'replaceme' max-pods = 9999999999 # replaceme diff --git a/pkg/providers/launchtemplate/testdata/br_userdata_merged.golden b/pkg/providers/launchtemplate/testdata/br_userdata_merged.golden index a3974898069d..2029b285c76d 100644 --- a/pkg/providers/launchtemplate/testdata/br_userdata_merged.golden +++ b/pkg/providers/launchtemplate/testdata/br_userdata_merged.golden @@ -1,6 +1,7 @@ [settings] [settings.kubernetes] api-server = 'https://test-cluster' +cloud-provider = 'external' cluster-certificate = 'ca-bundle' cluster-name = 'test-cluster' cluster-dns-ip = '10.0.100.10'