JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kubernetes: fix dns addon hashes, fix clusterDns, enable proxy on master

Browse Source
This commit is contained in:
Matej Cotman 2017-09-09 01:58:35 +02:00 committed by Robin Gloster
parent ddf5de5de0
commit 6ea272ced4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -581,7 +581,7 @@ in {
clusterDns = mkOption { clusterDns = mkOption {
description = "Use alternative DNS."; description = "Use alternative DNS.";
default = "10.10.0.1"; default = "10.1.0.1";
type = types.str; type = types.str;
}; };
@ -1024,6 +1024,7 @@ in {
services.kubernetes.controllerManager.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true;
services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]); services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]);
services.kubernetes.addonManager.enable = mkDefault true; services.kubernetes.addonManager.enable = mkDefault true;
services.kubernetes.proxy.enable = mkDefault true;
}) })
# if this node is only a master make it unschedulable by default # if this node is only a master make it unschedulable by default

6
nixos/modules/services/cluster/kubernetes/dns.nix
View File

@ -8,19 +8,19 @@ let
k8s-dns-kube-dns = pkgs.dockerTools.pullImage { k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64"; imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
imageTag = version; imageTag = version;
sha256 = "1zq8xl0rac99r925xmalmx1xc3pgzprh6csrzck9k8fnqp50smdk"; sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
}; };
k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage { k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64"; imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
imageTag = version; imageTag = version;
sha256 = "1dzw1qb97w2km6c5p564g1r5lnvyblwg5h2cssn09v7x4w3lf732"; sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
}; };
k8s-dns-sidecar = pkgs.dockerTools.pullImage { k8s-dns-sidecar = pkgs.dockerTools.pullImage {
imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64"; imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
imageTag = version; imageTag = version;
sha256 = "1k9k6xklc1b74slpldnjsciikhkfhi0nl2n1vn1xr1y40dggssy4"; sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
}; };
cfg = config.services.kubernetes.addons.dns; cfg = config.services.kubernetes.addons.dns;