nixos/kubernetes: minor module fixes #56589
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
re-ping @fpletz @calbrecht :-) |
|
He, the changes apply and it does not even rebuild the tests :) but i think they are sane nevertheless. |
infinisil
requested changes
Mar 8, 2019
| @@ -10,7 +10,7 @@ let | |||
| kind = "Config"; | |||
| clusters = [{ | |||
| name = "local"; | |||
| cluster.certificate-authority = cfg.caFile; | |||
| cluster.certificate-authority = if (hasAttr "caFile" conf) then conf.caFile else cfg.caFile; | |||
There was a problem hiding this comment.
Same as just conf.caFile or cfg.caFile
There was a problem hiding this comment.
@infinisil Right, thanks. Fixed now.
- mkDefault etcd instance name - make sure ca-cert in mkKubeConfig can be overriden - fix controller-manager "tls-private-key-file" flag name
johanot
force-pushed
the
kubernetes-module-stabilization
branch
from
01623c3
to
80c4fd4
Compare
infinisil
approved these changes
Mar 8, 2019
|
Thanks @infinisil . Do you mind cherry-picking this to 19.03 please? Or should I create a new PR? |
|
Cherry-picked to release-19.03 in 5831fe1 :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
While testing the revamped kubernetes module on our existing staging cluster with
easyCertsdisabled, I discovered some minor flaws in the module:The name of the etcd instance must be
mkDefault'ed, because otherwise we risk overriding existing etcd cluster names, and that could potentially lead to cluster re-initiation on existing setups.It's currently not possible to use the
kubernetes.lib.mkKubeConfigfunction to generate a kubeconfig with a custom ca. It will always use the toplevel ca cert. This is fine for current easyCerts setup, where we don't have multiple CA's, but in existing setups this might cause problems. WeTurns out adding TLS-server certs to the controller manager was never done as part of the revamp and therefore we never discovered that the
--tls-key-fileflag on kube-controller-manager was named incorrectly. Similar flag names differ across various k8s components, but in this case it must be--tls-private-key-file. We should add TLS-serving certs to the controller-manager in another PR.cc @fpletz for review
please backport to 19.03 :)
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)