Fix kubernetes#153951
Merged
zowoq merged 2 commits intoNixOS:masterfrom Jan 8, 2022
pennae:fix-kubernetes
Merged
Conversation
This reverts commit 7e28421.
otherwise the manual won't build. ideally they'll move back into the sandbox at some point, but we're obviously not qualified to put them there.
Contributor
Author
|
there is an alternative fix that's much more contained: diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix
index 00d572a5098..bed5fd9d9fc 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -5,7 +5,7 @@ with lib;
let
top = config.services.kubernetes;
cfg = top.pki;
- klib = options.services.kubernetes.lib;
+ klib = options.services.kubernetes.lib.default;
csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON {
key = {@zowoq both this PR and the patch alone on master fix the test. which one is preferrable to you? (we'd prefer the small patch fwiw) |
Contributor
|
I'd rather that we revert for now. I'm not confident that there hasn't been any other breakage in these modules that isn't addressed by the "small patch". |
Contributor
Author
|
then let's revert. 👍 |
Contributor
|
@ofborg test kubernetes |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
split docs build broke kubernetes.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes