Skip to content
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

Jump to bottom

Expose flag to explicitly disable cloud-provider=external kubelet argument #60

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Expose flag to explicitly disable cloud-provider=external kubelet argument #60

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
106b6d1
Expose flag to explicitly set cloud-provider=external kubelet argument
anmazzotti Oct 11, 2023
4d38b56
Update crds
anmazzotti Oct 11, 2023
926705a
Reverse the flag
anmazzotti Oct 11, 2023
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
4 changes: 4 additions & 0 deletions bootstrap/api/v1beta1/kthreesconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ type KThreesServerConfig struct {
// DisableComponents specifies extra commands to run before k3s setup runs
// +optional
DisableComponents []string `json:"disableComponents,omitempty"`

// UseExternalCloudProvider adds the 'cloud-provider=external' kubelet argument. (default: false)
// +optional
UseExternalCloudProvider bool `json:"useExternalCloudProvider,omitempty"`
}

type KThreesAgentConfig struct {
Expand Down
5 changes: 5 additions & 0 deletions bootstrap/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootstrap/controllers/kthreesconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (r *KThreesConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
return err
}

configStruct := k3s.GenerateWorkerConfig(serverURL, tokn, scope.Config.Spec.AgentConfig)
configStruct := k3s.GenerateWorkerConfig(serverURL, tokn, scope.Config.Spec.ServerConfig, scope.Config.Spec.AgentConfig)

b, err := kubeyaml.Marshal(configStruct)
if err != nil {
Expand Down
27 changes: 19 additions & 8 deletions pkg/k3s/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ type K3sAgentConfig struct {
}

func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, serverConfig bootstrapv1.KThreesServerConfig, agentConfig bootstrapv1.KThreesAgentConfig) K3sServerConfig {
kubeletExtraArgs := getKubeletExtraArgs(serverConfig)
k3sServerConfig := K3sServerConfig{
DisableCloudController: true,
DisableCloudController: serverConfig.UseExternalCloudProvider,
ClusterInit: true,
KubeAPIServerArgs: append(serverConfig.KubeAPIServerArgs, "anonymous-auth=true", getTLSCipherSuiteArg()),
TLSSan: append(serverConfig.TLSSan, controlPlaneEndpoint),
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, "cloud-provider=external"),
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, kubeletExtraArgs...),
KubeSchedulerArgs: serverConfig.KubeSchedulerArgs,
BindAddress: serverConfig.BindAddress,
HTTPSListenPort: serverConfig.HTTPSListenPort,
Expand All @@ -60,7 +61,7 @@ func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, s

k3sServerConfig.K3sAgentConfig = K3sAgentConfig{
Token: token,
KubeletArgs: append(agentConfig.KubeletArgs, "cloud-provider=external"),
KubeletArgs: append(agentConfig.KubeletArgs, kubeletExtraArgs...),
NodeLabels: agentConfig.NodeLabels,
NodeTaints: agentConfig.NodeTaints,
PrivateRegistry: agentConfig.PrivateRegistry,
Expand All @@ -72,11 +73,12 @@ func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, s
}

func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplaneendpoint string, serverConfig bootstrapv1.KThreesServerConfig, agentConfig bootstrapv1.KThreesAgentConfig) K3sServerConfig {
kubeletExtraArgs := getKubeletExtraArgs(serverConfig)
k3sServerConfig := K3sServerConfig{
DisableCloudController: true,
DisableCloudController: serverConfig.UseExternalCloudProvider,
KubeAPIServerArgs: append(serverConfig.KubeAPIServerArgs, "anonymous-auth=true", getTLSCipherSuiteArg()),
TLSSan: append(serverConfig.TLSSan, controlplaneendpoint),
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, "cloud-provider=external"),
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, kubeletExtraArgs...),
KubeSchedulerArgs: serverConfig.KubeSchedulerArgs,
BindAddress: serverConfig.BindAddress,
HTTPSListenPort: serverConfig.HTTPSListenPort,
Expand All @@ -92,7 +94,7 @@ func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplane
k3sServerConfig.K3sAgentConfig = K3sAgentConfig{
Token: token,
Server: serverURL,
KubeletArgs: append(agentConfig.KubeletArgs, "cloud-provider=external"),
KubeletArgs: append(agentConfig.KubeletArgs, kubeletExtraArgs...),
NodeLabels: agentConfig.NodeLabels,
NodeTaints: agentConfig.NodeTaints,
PrivateRegistry: agentConfig.PrivateRegistry,
Expand All @@ -103,11 +105,12 @@ func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplane
return k3sServerConfig
}

func GenerateWorkerConfig(serverURL string, token string, agentConfig bootstrapv1.KThreesAgentConfig) K3sAgentConfig {
func GenerateWorkerConfig(serverURL string, token string, serverConfig bootstrapv1.KThreesServerConfig, agentConfig bootstrapv1.KThreesAgentConfig) K3sAgentConfig {
kubeletExtraArgs := getKubeletExtraArgs(serverConfig)
return K3sAgentConfig{
Server: serverURL,
Token: token,
KubeletArgs: append(agentConfig.KubeletArgs, "cloud-provider=external"),
KubeletArgs: append(agentConfig.KubeletArgs, kubeletExtraArgs...),
NodeLabels: agentConfig.NodeLabels,
NodeTaints: agentConfig.NodeTaints,
PrivateRegistry: agentConfig.PrivateRegistry,
Expand Down Expand Up @@ -152,3 +155,11 @@ func getTLSCipherSuiteArg() string {

return fmt.Sprintf("tls-cipher-suites=%s", ciphersList)
}

func getKubeletExtraArgs(serverConfig bootstrapv1.KThreesServerConfig) []string {
kubeletExtraArgs := []string{}
if serverConfig.UseExternalCloudProvider {
kubeletExtraArgs = append(kubeletExtraArgs, "cloud-provider=external")
}
return kubeletExtraArgs
}