[kubeadm] Pass features gates to components #2037
Conversation
k8s-ci-robot
added
cncf-cla: yes
r2d4
force-pushed
the
kubeadm-feature-gates
branch
2 times, most recently
from
539e3ef
to
11c9318
Compare
Codecov Report
@@ Coverage Diff @@
## master #2037 +/- ##
==========================================
+ Coverage 28.59% 29.06% +0.47%
==========================================
Files 80 81 +1
Lines 5243 5288 +45
==========================================
+ Hits 1499 1537 +38
- Misses 3551 3558 +7
Partials 193 193
Continue to review full report at Codecov.
|
| api: | ||
| advertiseAddress: 192.168.1.101 | ||
| bindPort: 8443 | ||
| kubernetesVersion: v1.8.0-alpha.0 |
There was a problem hiding this comment.
The hardcoded versions here seem like they'd make these tests pretty brittle, can we get away without having this much boilerplate checked in?
There was a problem hiding this comment.
The versions are passed in on line 167 so they won't change. The "expectedCfg" is generated entirely from the bootstrapper.KubernetesConfig object
| for k := range componentToKubeadmConfigKey { | ||
| keys = append(keys, k) | ||
| } | ||
| sort.Strings(keys) |
There was a problem hiding this comment.
Why do we need this sort? Keys should be unique, and it looks like we collect the result sinto another map (extraConfig).
There was a problem hiding this comment.
The extraConfig is only an intermediary map that eventually gets passed to kubeadmExtraArgs, a slice.
I think I did this because a slice of []ComponentExtraArgs is passed to the template
type ComponentExtraArgs struct {
Component string
Options map[string]string
}For tests, we want to write the slice in alphabetical order according to components, and then for each component, write the options in alphabetical order.
I agree this whole construction is a bit suspect, so any refactoring ideas would be appreciated.
r2d4
force-pushed
the
kubeadm-feature-gates
branch
from
11c9318
to
dd50d76
Compare
Passes feature gates properly to apiserver, scheduler, controller-manager, and kubelet for the kubeadm bootstrapper.