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

fix: etcd extra args not passed to etcd #249

Merged
merged 1 commit into from
Jan 23, 2024
Merged

fix: etcd extra args not passed to etcd #249

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
8 changes: 4 additions & 4 deletions pkg/rke2/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ type rke2ServerConfig struct {
DisableComponents []string `json:"disable,omitempty"`
DisableKubeProxy bool `json:"disable-kube-proxy,omitempty"`
DisableScheduler bool `json:"disable-scheduler,omitempty"`
EtcdArgs []string `json:"etcd-arg,omitempty"`
EtcdExtraEnv map[string]string `json:"etcd-extra-env,omitempty"`
EtcdExtraMounts map[string]string `json:"etcd-extra-mount,omitempty"`
EtcdImage string `json:"etcd-image,omitempty"`
EtcdDisableSnapshots *bool `json:"etcd-disable-snapshots,omitempty"`
EtcdExposeMetrics bool `json:"etcd-expose-metrics,omitempty"`
EtcdS3 bool `json:"etcd-s3,omitempty"`
Expand Down Expand Up @@ -357,10 +361,6 @@ type rke2AgentConfig struct {
CloudProviderConfig string `json:"cloud-provider-config,omitempty"`
CloudProviderName string `json:"cloud-provider-name,omitempty"`
DataDir string `json:"data-dir,omitempty"`
EtcdArgs []string `json:"etcd-arg,omitempty"`
EtcdExtraEnv map[string]string `json:"etcd-extra-env,omitempty"`
EtcdExtraMounts map[string]string `json:"etcd-extra-mount,omitempty"`
EtcdImage string `json:"etcd-image,omitempty"`
ImageCredentialProviderConfig string `json:"image-credential-provider-config,omitempty"`
ImageCredentialProviderBinDir string `json:"image-credential-provider-bin-dir,omitempty"`
KubeProxyArgs []string `json:"kube-proxy-arg,omitempty"`
Expand Down