diff --git a/generators/k8s/default.nix b/generators/k8s/default.nix index 086c9d8..c2b55d4 100644 --- a/generators/k8s/default.nix +++ b/generators/k8s/default.nix @@ -292,10 +292,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -326,7 +322,7 @@ let apiVersion = if group == \"core\" then version else \"\${group}/\${version}\"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions.\"\${ref}\".options // extraOptions; + options = definitions.\"\${ref}\".options; config = mkMerge [ definitions.\"\${ref}\".config { diff --git a/modules/generated/v1.10.nix b/modules/generated/v1.10.nix index 2acd6e2..98a7519 100644 --- a/modules/generated/v1.10.nix +++ b/modules/generated/v1.10.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.11.nix b/modules/generated/v1.11.nix index 1001a6a..c701166 100644 --- a/modules/generated/v1.11.nix +++ b/modules/generated/v1.11.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.12.nix b/modules/generated/v1.12.nix index 7492d99..e484afe 100644 --- a/modules/generated/v1.12.nix +++ b/modules/generated/v1.12.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.13.nix b/modules/generated/v1.13.nix index b08fbca..b68aa8c 100644 --- a/modules/generated/v1.13.nix +++ b/modules/generated/v1.13.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.7.nix b/modules/generated/v1.7.nix index 996bd26..586f2ef 100644 --- a/modules/generated/v1.7.nix +++ b/modules/generated/v1.7.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.8.nix b/modules/generated/v1.8.nix index b2870ba..167a6c9 100644 --- a/modules/generated/v1.8.nix +++ b/modules/generated/v1.8.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config { diff --git a/modules/generated/v1.9.nix b/modules/generated/v1.9.nix index ebbf93c..fa4c90e 100644 --- a/modules/generated/v1.9.nix +++ b/modules/generated/v1.9.nix @@ -46,10 +46,6 @@ let mkOptionDefault = mkOverride 1001; - extraOptions = { - kubenix = {}; - }; - mergeValuesByKey = mergeKey: values: listToAttrs (map (value: nameValuePair ( @@ -80,7 +76,7 @@ let apiVersion = if group == "core" then version else "${group}/${version}"; in types.submodule ({name, ...}: { imports = getDefaults resource group version kind; - options = definitions."${ref}".options // extraOptions; + options = definitions."${ref}".options; config = mkMerge [ definitions."${ref}".config {