fix(k8s): remove extraOptions from generated resources

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

View file

@ -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
{

View file

@ -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
{

View file

@ -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
{

View file

@ -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
{

View file

@ -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
{

View file

@ -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
{

View file

@ -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
{