Merge "k0: expose controller-manager and scheduler metrics"
diff --git a/cluster/nix/defs-cluster-k0.nix b/cluster/nix/defs-cluster-k0.nix
index 832c741..c3519cc 100644
--- a/cluster/nix/defs-cluster-k0.nix
+++ b/cluster/nix/defs-cluster-k0.nix
@@ -70,7 +70,9 @@
ports = {
k8sAPIServerPlain = 4000;
k8sAPIServerSecure = 4001;
- k8sControllerManagerPlain = 0; # 4002; do not serve plain http
+ k8sControllerManagerPlain = 0; # would be 4002; do not serve plain http
k8sControllerManagerSecure = 4003;
+ k8sSchedulerPlain = 0; # would be 4004; do not serve plain http
+ k8sSchedulerSecure = 4005;
};
}
diff --git a/cluster/nix/modules/kubernetes.nix b/cluster/nix/modules/kubernetes.nix
index 10560cd..b36e806 100644
--- a/cluster/nix/modules/kubernetes.nix
+++ b/cluster/nix/modules/kubernetes.nix
@@ -154,7 +154,10 @@
'';
};
- controllerManager = {
+ controllerManager = let
+ top = config.services.kubernetes;
+ kubeconfig = top.lib.mkKubeConfig "controller-manager" pki.kube.controllermanager.config;
+ in {
enable = true;
bindAddress = "0.0.0.0";
insecurePort = ports.k8sControllerManagerPlain;
@@ -165,16 +168,26 @@
--service-cluster-ip-range=10.10.12.0/24 \
--use-service-account-credentials=true \
--secure-port=${toString ports.k8sControllerManagerSecure}\
+ --authentication-kubeconfig=${kubeconfig}\
+ --authorization-kubeconfig=${kubeconfig}\
'';
kubeconfig = pki.kube.controllermanager.config;
};
- scheduler = {
+ scheduler = let
+ top = config.services.kubernetes;
+ kubeconfig = top.lib.mkKubeConfig "scheduler" pki.kube.controllermanager.config;
+ in {
enable = true;
address = "0.0.0.0";
- port = 0;
+ port = ports.k8sSchedulerPlain;
leaderElect = true;
kubeconfig = pki.kube.scheduler.config;
+ extraOpts = ''
+ --secure-port=${toString ports.k8sSchedulerSecure}\
+ --authentication-kubeconfig=${kubeconfig}\
+ --authorization-kubeconfig=${kubeconfig}\
+ '';
};
proxy = {