Move kubernetes package options
From validation into kubernetes, makes more sense there.
This commit is contained in:
parent
12c92f4235
commit
09e6569dc5
3 changed files with 5 additions and 6 deletions
3
helm.nix
3
helm.nix
|
|
@ -48,8 +48,7 @@ in
|
|||
kubeVersion = mkOption {
|
||||
description = "Kubernetes version to build chart for";
|
||||
type = types.str;
|
||||
default = globalConfig.kubernetes.version;
|
||||
# default = "1.34.1";
|
||||
default = globalConfig.kubernetes.package.version;
|
||||
};
|
||||
|
||||
overrides = mkOption {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ let
|
|||
in
|
||||
{
|
||||
options.kubernetes = {
|
||||
# In your options definition
|
||||
package = lib.mkPackageOption pkgs "kubernetes" { };
|
||||
|
||||
resources = lib.mkOption {
|
||||
type = lib.types.attrsOf (lib.types.attrsOf (lib.types.attrsOf resourceBody));
|
||||
default = { };
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ in
|
|||
options.validation = {
|
||||
debug = lib.mkEnableOption "validation debugging";
|
||||
etcdPackage = lib.mkPackageOption pkgs "etcd" { };
|
||||
kubernetesPackage = lib.mkPackageOption pkgs "kubernetes" { };
|
||||
kubeadmConfig = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
};
|
||||
|
|
@ -39,7 +38,7 @@ in
|
|||
kubeadmConfig = lib.mapAttrsRecursive (n: v: lib.mkDefault v) {
|
||||
apiVersion = "kubeadm.k8s.io/v1beta4";
|
||||
kind = "ClusterConfiguration";
|
||||
kubernetesVersion = "v${cfg.kubernetesPackage.version}";
|
||||
kubernetesVersion = "v${config.kubernetes.package.version}";
|
||||
controlPlaneEndpoint = "$BIND_ADDRESS:$KUBERNETES_PORT";
|
||||
certificatesDir = "$CERT_DIR";
|
||||
networking = {
|
||||
|
|
@ -53,7 +52,7 @@ in
|
|||
''
|
||||
#! ${lib.getExe pkgs.fishMinimal}
|
||||
set --prepend PATH ${cfg.etcdPackage}/bin
|
||||
set --prepend PATH ${cfg.kubernetesPackage}/bin
|
||||
set --prepend PATH ${config.kubernetes.package}/bin
|
||||
set --prepend PATH ${pkgs.retry}/bin
|
||||
set TMPDIR (mktemp --directory --suffix=eknvalidation)
|
||||
${if cfg.debug then "echo TMPDIR: $TMPDIR" else ""}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue