From 3534f5fc6116230f1111d58b405cc250cf73076b Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sat, 4 Apr 2020 18:26:11 +0700
Subject: [PATCH] feat(k8s): deprecate createCustomTypesFromCRDs, only support
 in legacy

---
 modules/k8s.nix    | 17 -----------------
 modules/legacy.nix | 11 +++++++++--
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/modules/k8s.nix b/modules/k8s.nix
index be68321..e0be823 100644
--- a/modules/k8s.nix
+++ b/modules/k8s.nix
@@ -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;
diff --git a/modules/legacy.nix b/modules/legacy.nix
index 6dc8c43..7acf63e 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -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;