technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(k8s): remove extraOptions from generated resources

Browse source
This commit is contained in:
Jaka Hudoklin 2019-03-13 17:51:20 +01:00
parent 34e5452223
commit d55bebd48e
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95
8 changed files with 8 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
generators/k8s/default.nix
View file

@ -292,10 +292,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -326,7 +322,7 @@ let
apiVersion = if group == \"core\" then version else \"\${group}/\${version}\"; apiVersion = if group == \"core\" then version else \"\${group}/\${version}\";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions.\"\${ref}\".options // extraOptions; options = definitions.\"\${ref}\".options;
config = mkMerge [ config = mkMerge [
definitions.\"\${ref}\".config definitions.\"\${ref}\".config
{ {

6
modules/generated/v1.10.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.11.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.12.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.13.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.7.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.8.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {

6
modules/generated/v1.9.nix
View file

@ -46,10 +46,6 @@ let
mkOptionDefault = mkOverride 1001; mkOptionDefault = mkOverride 1001;
extraOptions = {
kubenix = {};
};
mergeValuesByKey = mergeKey: values: mergeValuesByKey = mergeKey: values:
listToAttrs (map listToAttrs (map
(value: nameValuePair ( (value: nameValuePair (
@ -80,7 +76,7 @@ let
apiVersion = if group == "core" then version else "${group}/${version}"; apiVersion = if group == "core" then version else "${group}/${version}";
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
imports = getDefaults resource group version kind; imports = getDefaults resource group version kind;
options = definitions."${ref}".options // extraOptions; options = definitions."${ref}".options;
config = mkMerge [ config = mkMerge [
definitions."${ref}".config definitions."${ref}".config
{ {