From 43e5639904427e7e973d053986421049760f6836 Mon Sep 17 00:00:00 2001 From: Andrea Mazzotti Date: Wed, 5 Feb 2025 14:08:14 +0100 Subject: [PATCH] Propagate cloud provider config Signed-off-by: Andrea Mazzotti --- pkg/rke2/config.go | 26 +++++++++++++++----------- pkg/rke2/config_test.go | 13 ++++++++++--- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/pkg/rke2/config.go b/pkg/rke2/config.go index 22e55c10..b167a63a 100644 --- a/pkg/rke2/config.go +++ b/pkg/rke2/config.go @@ -557,11 +557,13 @@ func GenerateInitControlPlaneConfig(opts ServerConfigOpts) (*ServerConfig, []boo } rke2AgentConfig, agentFiles, err := newRKE2AgentConfig(AgentConfigOpts{ - AgentConfig: opts.AgentConfig, - Client: opts.Client, - Ctx: opts.Ctx, - Token: opts.Token, - Version: opts.Version, + AgentConfig: opts.AgentConfig, + Client: opts.Client, + Ctx: opts.Ctx, + Token: opts.Token, + Version: opts.Version, + CloudProviderConfigMap: opts.ServerConfig.CloudProviderConfigMap, + CloudProviderName: opts.ServerConfig.CloudProviderName, }) if err != nil { return nil, nil, fmt.Errorf("failed to generate rke2 agent config: %w", err) @@ -588,12 +590,14 @@ func GenerateJoinControlPlaneConfig(opts ServerConfigOpts) (*ServerConfig, []boo } rke2AgentConfig, agentFiles, err := newRKE2AgentConfig(AgentConfigOpts{ - AgentConfig: opts.AgentConfig, - Client: opts.Client, - Ctx: opts.Ctx, - ServerURL: opts.ServerURL, - Token: opts.Token, - Version: opts.Version, + AgentConfig: opts.AgentConfig, + Client: opts.Client, + Ctx: opts.Ctx, + ServerURL: opts.ServerURL, + Token: opts.Token, + Version: opts.Version, + CloudProviderConfigMap: opts.ServerConfig.CloudProviderConfigMap, + CloudProviderName: opts.ServerConfig.CloudProviderName, }) if err != nil { return nil, nil, fmt.Errorf("failed to generate rke2 agent config: %w", err) diff --git a/pkg/rke2/config_test.go b/pkg/rke2/config_test.go index 933de28c..e495b67c 100644 --- a/pkg/rke2/config_test.go +++ b/pkg/rke2/config_test.go @@ -36,6 +36,7 @@ var _ = Describe("RKE2ServerConfig", func() { BeforeEach(func() { opts = &ServerConfigOpts{ + Token: "just-a-test-token", Cluster: v1beta1.Cluster{ Spec: v1beta1.ClusterSpec{ ClusterNetwork: &v1beta1.ClusterNetwork{ @@ -166,7 +167,7 @@ var _ = Describe("RKE2ServerConfig", func() { }) It("should succefully generate a server config", func() { - rke2ServerConfig, files, err := newRKE2ServerConfig(*opts) + rke2ServerConfig, files, err := GenerateInitControlPlaneConfig(*opts) Expect(err).ToNot(HaveOccurred()) serverConfig := opts.ServerConfig @@ -219,8 +220,9 @@ var _ = Describe("RKE2ServerConfig", func() { Expect(rke2ServerConfig.KubeControllerManagerExtraEnv).To(Equal(componentMapToSlice(extraEnv, serverConfig.KubeControllerManager.ExtraEnv))) Expect(rke2ServerConfig.CloudControllerManagerExtraMounts).To(Equal(componentMapToSlice(extraMount, serverConfig.CloudControllerManager.ExtraMounts))) Expect(rke2ServerConfig.CloudControllerManagerExtraEnv).To(Equal(componentMapToSlice(extraEnv, serverConfig.CloudControllerManager.ExtraEnv))) + Expect(rke2ServerConfig.Token).To(Equal(opts.Token)) - Expect(files).To(HaveLen(3)) + Expect(files).To(HaveLen(4)) Expect(files[0].Path).To(Equal(rke2ServerConfig.AuditPolicyFile)) Expect(files[0].Content).To(Equal("test_audit")) @@ -236,6 +238,11 @@ var _ = Describe("RKE2ServerConfig", func() { Expect(files[2].Content).To(Equal("test_ca")) Expect(files[2].Owner).To(Equal(consts.DefaultFileOwner)) Expect(files[2].Permissions).To(Equal("0640")) + + Expect(files[3].Path).To(Equal(rke2ServerConfig.CloudProviderConfig)) + Expect(files[3].Content).To(Equal("test_cloud_config")) + Expect(files[3].Owner).To(Equal(consts.DefaultFileOwner)) + Expect(files[3].Permissions).To(Equal(consts.DefaultFileMode)) }) }) @@ -295,7 +302,7 @@ var _ = Describe("RKE2 Agent Config", func() { }) It("should succefully generate an agent config", func() { - agentConfig, files, err := newRKE2AgentConfig(*opts) + agentConfig, files, err := GenerateWorkerConfig(*opts) Expect(err).ToNot(HaveOccurred()) Expect(agentConfig.ContainerRuntimeEndpoint).To(Equal(opts.AgentConfig.ContainerRuntimeEndpoint))