Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: bffc59badd08
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2ebadc4d8798
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 12, 2018

  1. nixos/kubernetes: improvements 

    - Added option 'cni.configDir' to allow for having CNI config outside of nix-store
  Existing behavior (writing verbatim CNI conf-files to nix-store) is still available.

- Removed unused option 'apiserver.publicAddress' and changed 'apiserver.address' to 'bindAddress'
  This conforms better to k8s docs and removes existing --bind-address hardcoding to 0.0.0.0

- Fixed c/p mistake in apiserver systemd unit description

- Updated 18.09 release notes to reflect changes to existing options
  And fixed some typos from previous PR

- Make docker images for Kubernetes Dashboard and kube-dns configurable
    Johan Thomsen committed Jun 12, 2018
    Copy the full SHA
    8d7ea96 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge pull request #41884 from johanot/k8s-improvements 

    nixos/kubernetes: improvements
    @srhb
    srhb committed Jun 13, 2018
    Copy the full SHA
    2ebadc4 View commit details
    Browse the repository at this point in the history