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

nixos/kubernetes: Put dashboard service account into bootstrapAddons

Browse Source 
to prevent errors in log about missing permissions when
addon manager starts the dashboard.
This commit is contained in:
Christian Albrecht 2019-03-01 10:28:29 +01:00
parent fd28c0a82a
commit 7df88bd802
No known key found for this signature in database
GPG Key ID: 866AF4B25DF7EB00
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
View File

@ -169,6 +169,23 @@ in {
}; };
}; };
kubernetes-dashboard-cm = {
apiVersion = "v1";
kind = "ConfigMap";
metadata = {
labels = {
k8s-app = "kubernetes-dashboard";
# Allows editing resource and makes sure it is created first.
"addonmanager.kubernetes.io/mode" = "EnsureExists";
};
name = "kubernetes-dashboard-settings";
namespace = "kube-system";
};
};
};
services.kubernetes.addonManager.bootstrapAddons = mkMerge [{
kubernetes-dashboard-sa = { kubernetes-dashboard-sa = {
apiVersion = "v1"; apiVersion = "v1";
kind = "ServiceAccount"; kind = "ServiceAccount";
@ -210,20 +227,9 @@ in {
}; };
type = "Opaque"; type = "Opaque";
}; };
kubernetes-dashboard-cm = { }
apiVersion = "v1";
kind = "ConfigMap"; (optionalAttrs cfg.rbac.enable
metadata = {
labels = {
k8s-app = "kubernetes-dashboard";
# Allows editing resource and makes sure it is created first.
"addonmanager.kubernetes.io/mode" = "EnsureExists";
};
name = "kubernetes-dashboard-settings";
namespace = "kube-system";
};
};
} // (optionalAttrs cfg.rbac.enable
(let (let
subjects = [{ subjects = [{
kind = "ServiceAccount"; kind = "ServiceAccount";
@ -323,6 +329,6 @@ in {
inherit subjects; inherit subjects;
}; };
}) })
)); ))];
}; };
} }