Skip to content

Commit e4ea03a

Browse files
authored
chore: add kube scheduler server args & plumb through to config (#54)
1 parent d95461f commit e4ea03a

5 files changed

+25
-0
lines changed

bootstrap/api/v1beta1/kthreesconfig_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ type KThreesServerConfig struct {
6060
// +optional
6161
KubeControllerManagerArgs []string `json:"kubeControllerManagerArgs,omitempty"`
6262

63+
// KubeSchedulerArgs is a customized flag for kube-scheduler process
64+
// +optional
65+
KubeSchedulerArgs []string `json:"kubeSchedulerArgs,omitempty"`
66+
6367
// TLSSan Add additional hostname or IP as a Subject Alternative Name in the TLS cert
6468
// +optional
6569
TLSSan []string `json:"tlsSan,omitempty"`

bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ spec:
181181
items:
182182
type: string
183183
type: array
184+
kubeSchedulerArgs:
185+
description: KubeSchedulerArgs is a customized flag for kube-scheduler
186+
process
187+
items:
188+
type: string
189+
type: array
184190
serviceCidr:
185191
description: 'ServiceCidr Network CIDR to use for services IPs
186192
(default: "10.43.0.0/16")'

bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@ spec:
196196
items:
197197
type: string
198198
type: array
199+
kubeSchedulerArgs:
200+
description: KubeSchedulerArgs is a customized flag for
201+
kube-scheduler process
202+
items:
203+
type: string
204+
type: array
199205
serviceCidr:
200206
description: 'ServiceCidr Network CIDR to use for services
201207
IPs (default: "10.43.0.0/16")'

bootstrap/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,12 @@ spec:
262262
items:
263263
type: string
264264
type: array
265+
kubeSchedulerArgs:
266+
description: KubeSchedulerArgs is a customized flag for kube-scheduler
267+
process
268+
items:
269+
type: string
270+
type: array
265271
serviceCidr:
266272
description: 'ServiceCidr Network CIDR to use for services
267273
IPs (default: "10.43.0.0/16")'

pkg/k3s/config.go

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type K3sServerConfig struct {
1313
DisableCloudController bool `json:"disable-cloud-controller,omitempty"`
1414
KubeAPIServerArgs []string `json:"kube-apiserver-arg,omitempty"`
1515
KubeControllerManagerArgs []string `json:"kube-controller-manager-arg,omitempty"`
16+
KubeSchedulerArgs []string `json:"kube-scheduler-arg,omitempty"`
1617
TLSSan []string `json:"tls-san,omitempty"`
1718
BindAddress string `json:"bind-address,omitempty"`
1819
HTTPSListenPort string `json:"https-listen-port,omitempty"`
@@ -45,6 +46,7 @@ func GenerateInitControlPlaneConfig(controlPlaneEndpoint string, token string, s
4546
KubeAPIServerArgs: append(serverConfig.KubeAPIServerArgs, "anonymous-auth=true", getTLSCipherSuiteArg()),
4647
TLSSan: append(serverConfig.TLSSan, controlPlaneEndpoint),
4748
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, "cloud-provider=external"),
49+
KubeSchedulerArgs: serverConfig.KubeSchedulerArgs,
4850
BindAddress: serverConfig.BindAddress,
4951
HTTPSListenPort: serverConfig.HTTPSListenPort,
5052
AdvertiseAddress: serverConfig.AdvertiseAddress,
@@ -75,6 +77,7 @@ func GenerateJoinControlPlaneConfig(serverURL string, token string, controlplane
7577
KubeAPIServerArgs: append(serverConfig.KubeAPIServerArgs, "anonymous-auth=true", getTLSCipherSuiteArg()),
7678
TLSSan: append(serverConfig.TLSSan, controlplaneendpoint),
7779
KubeControllerManagerArgs: append(serverConfig.KubeControllerManagerArgs, "cloud-provider=external"),
80+
KubeSchedulerArgs: serverConfig.KubeSchedulerArgs,
7881
BindAddress: serverConfig.BindAddress,
7982
HTTPSListenPort: serverConfig.HTTPSListenPort,
8083
AdvertiseAddress: serverConfig.AdvertiseAddress,

0 commit comments

Comments
 (0)