Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix kubernetes #153951

Merged
merged 2 commits into from
Jan 8, 2022
Merged

Fix kubernetes #153951

merged 2 commits into from
Jan 8, 2022

Conversation

pennae
Copy link
Contributor

@pennae pennae commented Jan 8, 2022

Motivation for this change

split docs build broke kubernetes.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

pennae added 2 commits January 8, 2022 06:59
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.
@pennae pennae requested a review from zowoq January 8, 2022 06:13
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 8, 2022
@pennae pennae mentioned this pull request Jan 8, 2022
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 8, 2022
@pennae
Copy link
Contributor Author

pennae commented Jan 8, 2022

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)

@zowoq
Copy link
Contributor

zowoq commented Jan 8, 2022

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".

@pennae
Copy link
Contributor Author

pennae commented Jan 8, 2022

then let's revert. 👍

@zowoq
Copy link
Contributor

zowoq commented Jan 8, 2022

@ofborg test kubernetes

@zowoq zowoq merged commit 2d356a1 into NixOS:master Jan 8, 2022
@pennae pennae deleted the fix-kubernetes branch June 9, 2022 05:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants