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

kubernetes: fix missing port if advertiseAddress specified #99226

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

DavHau
Copy link
Member

@DavHau DavHau commented Oct 1, 2020

Motivation for this change

If apiserver.advertiseAddress and apiserver.securePort were specified, the wrong port was used inside the default value of apiserverAddress

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/367

@InLaw
Copy link
Contributor

InLaw commented Mar 28, 2021

Result of nixpkgs-review pr 99226 1

@stale
Copy link

stale bot commented Sep 26, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 26, 2021
Copy link
Contributor

@Jayman2000 Jayman2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here’s how I was able to test out this change.

  1. Create a file named kubernetes-port-test.nix
  2. Put the following into that file:
    # 🅭🄍1.0 This file is dedicated to the public domain using the CC0 1.0 Universal
    # Public Domain Dedication:
    # <https://creativecommons.org/publicdomain/zero/1.0/>
    
    let
      configuration = {
        services.kubernetes.apiserver = {
          enable = true;
          advertiseAddress = "example.com";
          securePort = 1234;
        };
      };
      pkgs = import path/to/nixpkgs { };
      nixOSPackage = pkgs.nixos configuration;
    in nixOSPackage.config.services.kubernetes.apiserverAddress
  3. Run nix-instantiate --eval kubernetes-port-test.nix

When I do that procedure with Nixpkgs’s master branch checked out, nix-instantiate prints "https://example.com". When I do that preocedure with this PR’s branch checked out, nix-instantiate prints "https://example.com:1234". In other words, I think that this PR works properly.


I also tried running the tests for the Kubernetes module. nix-build -A nixosTests.kubernetes.dns failed on my system, but that test also fails when I run it with this PR’s parent commit, so I don’t think that this PR needs to address that failure. nix-build -A nixosTests.kubernetes.rbac succeeded on my system.


Here’s what I think should be changed:

  • The commit message should start with “nixos/kubernetes:” (See this section of nixos/README.md.)
  • I would take the “Motivation for this change” section of the PR comment, and put it in the body of the commit message. That will make it easier for people to understand this change when using git-log.

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Feb 26, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants