feat(k8s): deprecate createCustomTypesFromCRDs, only support in legacy

This commit is contained in:
Jaka Hudoklin 2020-04-04 18:26:11 +07:00
parent 13e47144fd
commit 3534f5fc61
2 changed files with 9 additions and 19 deletions

View file

@ -242,12 +242,6 @@ in {
type = types.attrsOf types.attrs;
};
createCustomTypesFromCRDs = mkOption {
description = "Whether to create customTypes from custom resource definitions";
type = types.bool;
default = false;
};
customTypes = mkOption {
description = "List of custom resource types to make API for";
type = coerceListOfSubmodulesToAttrs {
@ -389,17 +383,6 @@ in {
cfg.api.resources.${type.group}.${type.version}.${type.kind}
) cfg.api.types);
# custom types created from customResourceDefinitions
kubernetes.customTypes = mkIf cfg.createCustomTypesFromCRDs (
mapAttrsToList (name: crd: {
group = crd.spec.group;
version = crd.spec.version;
kind = crd.spec.names.kind;
name = crd.spec.names.plural;
attrName = mkOptionDefault name;
}) (cfg.resources.customResourceDefinitions or {})
);
kubernetes.generated = k8s.mkHashedList {
items = config.kubernetes.objects;
labels."kubenix/project-name" = config.kubenix.project;

View file

@ -190,8 +190,15 @@ in {
) config.kubernetes.modules
);
# create custom types from CRDs was old behavior
createCustomTypesFromCRDs = true;
# custom types created from customResourceDefinitions
customTypes =
mapAttrsToList (name: crd: {
group = crd.spec.group;
version = crd.spec.version;
kind = crd.spec.names.kind;
name = crd.spec.names.plural;
attrName = mkOptionDefault name;
}) (config.kubernetes.resources.customResourceDefinitions or {});
defaultModuleConfiguration.all = {
_file = head options.kubernetes.defaultModuleConfiguration.files;