diff --git a/helm.nix b/helm.nix index 96ccf1a..a6da083 100644 --- a/helm.nix +++ b/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 { diff --git a/kubernetes.nix b/kubernetes.nix index 8342344..c258448 100644 --- a/kubernetes.nix +++ b/kubernetes.nix @@ -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 = { }; diff --git a/validation.nix b/validation.nix index e79c80e..389b062 100644 --- a/validation.nix +++ b/validation.nix @@ -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 ""}