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

nixos/kubernetes: Update kube-dns and kube-dashbashboard docker image derivations to new pullImage function signature

Browse Source
This commit is contained in:
Sebastian Jordan 2018-05-16 12:46:36 +02:00
parent 6db7f92cc2
commit b4b3892bd1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,9 @@ let
image = pkgs.dockerTools.pullImage { image = pkgs.dockerTools.pullImage {
imageName = name; imageName = name;
imageTag = version; finalImageTag = version;
sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad"; sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad";
imageDigest = "sha256:e7984d10351601080bbc146635d51f0cfbea31ca6f0df323cf7a58cf2f6a68df";
}; };
in { in {
options.services.kubernetes.addons.dashboard = { options.services.kubernetes.addons.dashboard = {

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

@ -7,20 +7,23 @@ 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; finalImageTag = version;
sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp"; sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
imageDigest = "sha256:40790881bbe9ef4ae4ff7fe8b892498eecb7fe6dcc22661402f271e03f7de344";
}; };
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; finalImageTag = version;
sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c"; sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
imageDigest = "sha256:aeeb994acbc505eabc7415187cd9edb38cbb5364dc1c2fc748154576464b3dc2";
}; };
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; finalImageTag = version;
sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm"; sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
imageDigest = "sha256:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9";
}; };
cfg = config.services.kubernetes.addons.dns; cfg = config.services.kubernetes.addons.dns;