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

feat(platform): add etcd config #790

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(platform): add etcd config #790

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
13 changes: 4 additions & 9 deletions pkg/platform/provider/baremetal/cluster/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ func (p *Provider) getClusterConfiguration(c *v1.Cluster) *kubeadmv1beta2.Cluste
utilruntime.Must(json.Merge(&config.Etcd, &c.Spec.Etcd))
if config.Etcd.Local != nil {
config.Etcd.Local.ImageTag = images.Get().ETCD.Tag

if config.Etcd.Local.ExtraArgs != nil && p.config.Etcd.ExtraArgs != nil {
utilruntime.Must(mergo.Merge(&config.Etcd.Local.ExtraArgs, p.config.Etcd.ExtraArgs))
}
}

return config
Expand Down Expand Up @@ -198,9 +202,6 @@ func (p *Provider) getAPIServerExtraArgs(c *v1.Cluster) map[string]string {
args["authorization-webhook-config-file"] = constants.KubernetesAuthzWebhookConfigFile
args["authorization-mode"] = "Node,RBAC,Webhook"
}
for k, v := range c.Spec.APIServerExtraArgs {
args[k] = v
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove above lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's redundant. the assignment has been done in the next line "utilruntime.Must(mergo.Merge(&args, c.Spec.APIServerExtraArgs))"

utilruntime.Must(mergo.Merge(&args, c.Spec.APIServerExtraArgs))
utilruntime.Must(mergo.Merge(&args, p.config.APIServer.ExtraArgs))
Expand All @@ -215,9 +216,6 @@ func (p *Provider) getControllerManagerExtraArgs(c *v1.Cluster) map[string]strin
"cluster-cidr": c.Spec.ClusterCIDR,
"service-cluster-ip-range": c.Status.ServiceCIDR,
}
for k, v := range c.Spec.ControllerManagerExtraArgs {
args[k] = v
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove above lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's redundant. the assignment has been done in the next line.


utilruntime.Must(mergo.Merge(&args, c.Spec.ControllerManagerExtraArgs))
utilruntime.Must(mergo.Merge(&args, p.config.ControllerManager.ExtraArgs))
Expand All @@ -230,9 +228,6 @@ func (p *Provider) getSchedulerExtraArgs(c *v1.Cluster) map[string]string {
"use-legacy-policy-config": "true",
"policy-config-file": constants.KuberentesSchedulerPolicyConfigFile,
}
for k, v := range c.Spec.SchedulerExtraArgs {
args[k] = v
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove above lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's redundant. the assignment has been done in the next line.

utilruntime.Must(mergo.Merge(&args, c.Spec.SchedulerExtraArgs))
utilruntime.Must(mergo.Merge(&args, p.config.Scheduler.ExtraArgs))
Expand Down
5 changes: 5 additions & 0 deletions pkg/platform/provider/baremetal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type Config struct {
Scheduler Scheduler `yaml:"scheduler"`
AuthzWebhook AuthzWebhook `yaml:"authzWebhook"`
Business Business `yaml:"business"`
Etcd Etcd `yaml:"etcd"`
}

func (c *Config) Save(filename string) error {
Expand Down Expand Up @@ -122,3 +123,7 @@ type AuthzWebhook struct {
type Business struct {
Enabled bool `yaml:"enabled"`
}

type Etcd struct {
ExtraArgs map[string]string `yaml:"extraArgs"`
}