Skip to content

Commit 48cbfed

Browse files
authored
use component config for default setup (kubernetes-sigs#724)
1 parent a2249cd commit 48cbfed

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
apiVersion: config.jobset.x-k8s.io/v1alpha1
3+
kind: Configuration
4+
leaderElection:
5+
leaderElect: true

config/components/manager/kustomization.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
resources:
22
- manager.yaml
33

4+
generatorOptions:
5+
disableNameSuffixHash: true
6+
7+
configMapGenerator:
8+
- files:
9+
- controller_manager_config.yaml
10+
name: manager-config
11+
412
apiVersion: kustomize.config.k8s.io/v1beta1
513
kind: Kustomization
614
images:

config/default/manager_config_patch.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ spec:
99
containers:
1010
- name: manager
1111
args:
12+
- "--config=/controller_manager_config.yaml"
1213
- "--zap-log-level=2"
13-
- "--health-probe-bind-address=:8081"
14-
- "--metrics-bind-address=:8443"
15-
- "--leader-elect"
14+
volumeMounts:
15+
- name: manager-config
16+
mountPath: /controller_manager_config.yaml
17+
subPath: controller_manager_config.yaml
18+
volumes:
19+
- name: manager-config
20+
configMap:
21+
name: manager-config

main.go

+14
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,32 @@ func main() {
116116

117117
if flagsSet["metrics-bind-address"] {
118118
options.Metrics.BindAddress = metricsAddr
119+
} else {
120+
options.Metrics.BindAddress = cfg.Metrics.BindAddress
119121
}
122+
120123
if flagsSet["health-probe-bind-address"] {
121124
options.HealthProbeBindAddress = probeAddr
125+
} else {
126+
options.HealthProbeBindAddress = cfg.Health.HealthProbeBindAddress
122127
}
128+
123129
if flagsSet["leader-elect"] {
124130
options.LeaderElection = enableLeaderElection
131+
} else {
132+
options.LeaderElection = *cfg.LeaderElection.LeaderElect
125133
}
134+
126135
if flagsSet["kube-api-qps"] {
127136
kubeConfig.QPS = float32(qps)
137+
} else {
138+
kubeConfig.QPS = *cfg.ClientConnection.QPS
128139
}
140+
129141
if flagsSet["kube-api-burst"] {
130142
kubeConfig.Burst = burst
143+
} else {
144+
kubeConfig.Burst = int(*cfg.ClientConnection.Burst)
131145
}
132146
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
133147
// More info:

0 commit comments

Comments
 (0)