nixos/kubernetes: drop obsolete options/cmdline flags
This commit is contained in:
parent
f466f36d02
commit
ae712870af
@ -18,7 +18,8 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
|
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
|
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
|
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecureBindAddress" ] "")
|
||||||
|
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "insecurePort" ] "")
|
||||||
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
|
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
|
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
|
(mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
|
||||||
@ -164,18 +165,6 @@ in
|
|||||||
type = listOf str;
|
type = listOf str;
|
||||||
};
|
};
|
||||||
|
|
||||||
insecureBindAddress = mkOption {
|
|
||||||
description = lib.mdDoc "The IP address on which to serve the --insecure-port.";
|
|
||||||
default = "127.0.0.1";
|
|
||||||
type = str;
|
|
||||||
};
|
|
||||||
|
|
||||||
insecurePort = mkOption {
|
|
||||||
description = lib.mdDoc "Kubernetes apiserver insecure listening port. (0 = disabled)";
|
|
||||||
default = 0;
|
|
||||||
type = int;
|
|
||||||
};
|
|
||||||
|
|
||||||
kubeletClientCaFile = mkOption {
|
kubeletClientCaFile = mkOption {
|
||||||
description = lib.mdDoc "Path to a cert file for connecting to kubelet.";
|
description = lib.mdDoc "Path to a cert file for connecting to kubelet.";
|
||||||
default = top.caFile;
|
default = top.caFile;
|
||||||
@ -376,8 +365,6 @@ in
|
|||||||
"--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \
|
"--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \
|
||||||
${optionalString (cfg.proxyClientKeyFile != null)
|
${optionalString (cfg.proxyClientKeyFile != null)
|
||||||
"--proxy-client-key-file=${cfg.proxyClientKeyFile}"} \
|
"--proxy-client-key-file=${cfg.proxyClientKeyFile}"} \
|
||||||
--insecure-bind-address=${cfg.insecureBindAddress} \
|
|
||||||
--insecure-port=${toString cfg.insecurePort} \
|
|
||||||
${optionalString (cfg.runtimeConfig != "")
|
${optionalString (cfg.runtimeConfig != "")
|
||||||
"--runtime-config=${cfg.runtimeConfig}"} \
|
"--runtime-config=${cfg.runtimeConfig}"} \
|
||||||
--secure-port=${toString cfg.securePort} \
|
--secure-port=${toString cfg.securePort} \
|
||||||
|
@ -10,7 +10,7 @@ in
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])
|
(mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])
|
||||||
(mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])
|
(mkRemovedOptionModule [ "services" "kubernetes" "controllerManager" "insecurePort" ] "")
|
||||||
];
|
];
|
||||||
|
|
||||||
###### interface
|
###### interface
|
||||||
@ -50,12 +50,6 @@ in
|
|||||||
type = listOf str;
|
type = listOf str;
|
||||||
};
|
};
|
||||||
|
|
||||||
insecurePort = mkOption {
|
|
||||||
description = lib.mdDoc "Kubernetes controller manager insecure listening port.";
|
|
||||||
default = 0;
|
|
||||||
type = int;
|
|
||||||
};
|
|
||||||
|
|
||||||
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
|
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
|
||||||
|
|
||||||
leaderElect = mkOption {
|
leaderElect = mkOption {
|
||||||
@ -133,7 +127,6 @@ in
|
|||||||
--leader-elect=${boolToString cfg.leaderElect} \
|
--leader-elect=${boolToString cfg.leaderElect} \
|
||||||
${optionalString (cfg.rootCaFile!=null)
|
${optionalString (cfg.rootCaFile!=null)
|
||||||
"--root-ca-file=${cfg.rootCaFile}"} \
|
"--root-ca-file=${cfg.rootCaFile}"} \
|
||||||
--port=${toString cfg.insecurePort} \
|
|
||||||
--secure-port=${toString cfg.securePort} \
|
--secure-port=${toString cfg.securePort} \
|
||||||
${optionalString (cfg.serviceAccountKeyFile!=null)
|
${optionalString (cfg.serviceAccountKeyFile!=null)
|
||||||
"--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \
|
"--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \
|
||||||
|
@ -26,7 +26,6 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.kubernetes.kubelet = {
|
services.kubernetes.kubelet = {
|
||||||
networkPlugin = mkDefault "cni";
|
|
||||||
cni.config = mkDefault [{
|
cni.config = mkDefault [{
|
||||||
name = "mynet";
|
name = "mynet";
|
||||||
type = "flannel";
|
type = "flannel";
|
||||||
|
@ -62,6 +62,7 @@ in
|
|||||||
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
|
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
|
||||||
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
|
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
|
||||||
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
|
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
|
||||||
|
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")
|
||||||
];
|
];
|
||||||
|
|
||||||
###### interface
|
###### interface
|
||||||
@ -189,12 +190,6 @@ in
|
|||||||
default = {};
|
default = {};
|
||||||
};
|
};
|
||||||
|
|
||||||
networkPlugin = mkOption {
|
|
||||||
description = lib.mdDoc "Network plugin to use by Kubernetes.";
|
|
||||||
type = nullOr (enum ["cni" "kubenet"]);
|
|
||||||
default = "kubenet";
|
|
||||||
};
|
|
||||||
|
|
||||||
nodeIp = mkOption {
|
nodeIp = mkOption {
|
||||||
description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node.";
|
description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node.";
|
||||||
default = null;
|
default = null;
|
||||||
@ -315,7 +310,6 @@ in
|
|||||||
"--cluster-dns=${cfg.clusterDns}"} \
|
"--cluster-dns=${cfg.clusterDns}"} \
|
||||||
${optionalString (cfg.clusterDomain != "")
|
${optionalString (cfg.clusterDomain != "")
|
||||||
"--cluster-domain=${cfg.clusterDomain}"} \
|
"--cluster-domain=${cfg.clusterDomain}"} \
|
||||||
--cni-conf-dir=${cniConfig} \
|
|
||||||
${optionalString (cfg.featureGates != [])
|
${optionalString (cfg.featureGates != [])
|
||||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||||
--hairpin-mode=hairpin-veth \
|
--hairpin-mode=hairpin-veth \
|
||||||
@ -323,8 +317,6 @@ in
|
|||||||
--healthz-port=${toString cfg.healthz.port} \
|
--healthz-port=${toString cfg.healthz.port} \
|
||||||
--hostname-override=${cfg.hostname} \
|
--hostname-override=${cfg.hostname} \
|
||||||
--kubeconfig=${kubeconfig} \
|
--kubeconfig=${kubeconfig} \
|
||||||
${optionalString (cfg.networkPlugin != null)
|
|
||||||
"--network-plugin=${cfg.networkPlugin}"} \
|
|
||||||
${optionalString (cfg.nodeIp != null)
|
${optionalString (cfg.nodeIp != null)
|
||||||
"--node-ip=${cfg.nodeIp}"} \
|
"--node-ip=${cfg.nodeIp}"} \
|
||||||
--pod-infra-container-image=pause \
|
--pod-infra-container-image=pause \
|
||||||
|
Loading…
Reference in New Issue
Block a user