diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-02-16 13:56:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 13:56:59 +0000 |
| commit | 87559028efcfb8860ece1ac97296702cca4830ae (patch) | |
| tree | 3e769383682d452348e97c2c38aeb7856e7254a1 /nixos/modules/services | |
| parent | b2f39f97d061010b2a0b7e25e2ad1ffdb293fe19 (diff) | |
| parent | f44a81e19fb8d9f57c8e3b2944c473ba1e3466d7 (diff) | |
| download | nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.gz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.bz2 nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.lz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.xz nixlib-87559028efcfb8860ece1ac97296702cca4830ae.tar.zst nixlib-87559028efcfb8860ece1ac97296702cca4830ae.zip | |
Merge pull request #33954 from kuznero/pr/kubernetes
kubernetes: 1.7.9 -> 1.9.1
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/dashboard.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index 75d71fccfda4..e331889b9dd5 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -6,12 +6,12 @@ let cfg = config.services.kubernetes.addons.dashboard; name = "gcr.io/google_containers/kubernetes-dashboard-amd64"; - version = "v1.6.3"; + version = "v1.8.2"; image = pkgs.dockerTools.pullImage { imageName = name; imageTag = version; - sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4"; + sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad"; }; in { options.services.kubernetes.addons.dashboard = { diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 077953e4d4f8..4a2c6f0833eb 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -301,8 +301,8 @@ in { Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/> ''; - default = ["RBAC"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]); + default = ["RBAC" "Node"]; + type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]); }; authorizationPolicy = mkOption { @@ -344,7 +344,7 @@ in { Kubernetes admission control plugins to use. See <link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/> ''; - default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"]; + default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"]; example = [ "NamespaceLifecycle" "NamespaceExists" "LimitRanger" "SecurityContextDeny" "ServiceAccount" "ResourceQuota" |