Merge pull request #56001 from johanot/coredns-1.3.1-dashboard-1.10.1
nixos/kubernetes: Bump CoreDNS and Dashboard
This commit is contained in:
commit
45fceae236
@ -8,6 +8,13 @@ in {
|
|||||||
options.services.kubernetes.addons.dashboard = {
|
options.services.kubernetes.addons.dashboard = {
|
||||||
enable = mkEnableOption "kubernetes dashboard addon";
|
enable = mkEnableOption "kubernetes dashboard addon";
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
description = "Extra arguments to append to the dashboard cmdline";
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [];
|
||||||
|
example = ["--enable-skip-login"];
|
||||||
|
};
|
||||||
|
|
||||||
rbac = mkOption {
|
rbac = mkOption {
|
||||||
description = "Role-based access control (RBAC) options";
|
description = "Role-based access control (RBAC) options";
|
||||||
default = {};
|
default = {};
|
||||||
@ -31,7 +38,7 @@ in {
|
|||||||
version = mkOption {
|
version = mkOption {
|
||||||
description = "Which version of the kubernetes dashboard to deploy";
|
description = "Which version of the kubernetes dashboard to deploy";
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "v1.8.3";
|
default = "v1.10.1";
|
||||||
};
|
};
|
||||||
|
|
||||||
image = mkOption {
|
image = mkOption {
|
||||||
@ -39,9 +46,9 @@ in {
|
|||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
default = {
|
default = {
|
||||||
imageName = "k8s.gcr.io/kubernetes-dashboard-amd64";
|
imageName = "k8s.gcr.io/kubernetes-dashboard-amd64";
|
||||||
imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";
|
imageDigest = "sha256:0ae6b69432e78069c5ce2bcde0fe409c5c4d6f0f4d9cd50a17974fea38898747";
|
||||||
finalImageTag = cfg.version;
|
finalImageTag = cfg.version;
|
||||||
sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";
|
sha256 = "01xrr4pwgr2hcjrjsi3d14ifpzdfbxzqpzxbk2fkbjb9zkv38zxy";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -99,7 +106,7 @@ in {
|
|||||||
memory = "100Mi";
|
memory = "100Mi";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
args = ["--auto-generate-certificates"];
|
args = ["--auto-generate-certificates"] ++ cfg.extraArgs;
|
||||||
volumeMounts = [{
|
volumeMounts = [{
|
||||||
name = "tmp-volume";
|
name = "tmp-volume";
|
||||||
mountPath = "/tmp";
|
mountPath = "/tmp";
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.2.5";
|
version = "1.3.1";
|
||||||
cfg = config.services.kubernetes.addons.dns;
|
cfg = config.services.kubernetes.addons.dns;
|
||||||
ports = {
|
ports = {
|
||||||
dns = 10053;
|
dns = 10053;
|
||||||
@ -43,9 +43,9 @@ in {
|
|||||||
type = types.attrs;
|
type = types.attrs;
|
||||||
default = {
|
default = {
|
||||||
imageName = "coredns/coredns";
|
imageName = "coredns/coredns";
|
||||||
imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6";
|
imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4";
|
||||||
finalImageTag = version;
|
finalImageTag = version;
|
||||||
sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i";
|
sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user