git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56001 from johanot/coredns-1.3.1-dashboard-1.10.1

nixos/kubernetes: Bump CoreDNS and Dashboard

commit45fceae236b50989c8c051b3393f8e90ecf1dcff authorSarah Brofeldt <sbrofeldt@gmail.com> dateTue 19 Feb 2019, 20:31 (8 years ago) parent03bffcbf738618
2 files changed+14−7
nixos/modules/services/cluster/kubernetes/dashboard.nix+11−4 nixos/modules/services/cluster/kubernetes/dns.nix+3−3
nixos/modules/services/cluster/kubernetes/dashboard.nix+11−4
@@ -8,6 +8,13 @@ in {
88 options.services.kubernetes.addons.dashboard = {
99 enable = mkEnableOption "kubernetes dashboard addon";
1010
11+ extraArgs = mkOption {
12+ description = "Extra arguments to append to the dashboard cmdline";
13+ type = types.listOf types.str;
14+ default = [];
15+ example = ["--enable-skip-login"];
16+ };
17+
1118 rbac = mkOption {
1219 description = "Role-based access control (RBAC) options";
1320 default = {};
@@ -31,7 +38,7 @@ in {
3138 version = mkOption {
3239 description = "Which version of the kubernetes dashboard to deploy";
3340 type = types.str;
34− default = "v1.8.3";
41+ default = "v1.10.1";
3542 };
3643
3744 image = mkOption {
@@ -39,9 +46,9 @@ in {
3946 type = types.attrs;
4047 default = {
4148 imageName = "k8s.gcr.io/kubernetes-dashboard-amd64";
42− imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";
49+ imageDigest = "sha256:0ae6b69432e78069c5ce2bcde0fe409c5c4d6f0f4d9cd50a17974fea38898747";
4350 finalImageTag = cfg.version;
44− sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";
51+ sha256 = "01xrr4pwgr2hcjrjsi3d14ifpzdfbxzqpzxbk2fkbjb9zkv38zxy";
4552 };
4653 };
4754 };
@@ -99,7 +106,7 @@ in {
99106 memory = "100Mi";
100107 };
101108 };
102− args = ["--auto-generate-certificates"];
109+ args = ["--auto-generate-certificates"] ++ cfg.extraArgs;
103110 volumeMounts = [{
104111 name = "tmp-volume";
105112 mountPath = "/tmp";
nixos/modules/services/cluster/kubernetes/dns.nix+3−3
@@ -3,7 +3,7 @@
33with lib;
44
55let
6− version = "1.2.5";
6+ version = "1.3.1";
77 cfg = config.services.kubernetes.addons.dns;
88 ports = {
99 dns = 10053;
@@ -43,9 +43,9 @@ in {
4343 type = types.attrs;
4444 default = {
4545 imageName = "coredns/coredns";
46− imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6";
46+ imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4";
4747 finalImageTag = version;
48− sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i";
48+ sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5";
4949 };
5050 };
5151 };