diff --git a/generators/k8s/default.nix b/generators/k8s/default.nix index 01b8f1d..086c9d8 100644 --- a/generators/k8s/default.nix +++ b/generators/k8s/default.nix @@ -365,9 +365,7 @@ in { \"${resource.resource}\" = ${genResourceOptions resource}; ") latestResourcesByKind)}}; - config = {${concatStrings (mapAttrsToList (name: resource: " - \"${resource.group}\".\"${resource.version}\".\"${resource.kind}\" = config.\"${resource.resource}\"; - ") latestResourcesByKind)}} // { + config = { inherit definitions; resources = [${concatStrings (mapAttrsToList (name: resource: "{ diff --git a/modules/generated/v1.10.nix b/modules/generated/v1.10.nix index a33c47e..2acd6e2 100644 --- a/modules/generated/v1.10.nix +++ b/modules/generated/v1.10.nix @@ -29481,104 +29481,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1"."DaemonSet" = config."daemonsets"; - - "apps"."v1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "autoscaling"."v2beta1"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "admissionregistration.k8s.io"."v1beta1"."MutatingWebhookConfiguration" = config."mutatingwebhookconfigurations"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1alpha1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - - "admissionregistration.k8s.io"."v1beta1"."ValidatingWebhookConfiguration" = config."validatingwebhookconfigurations"; - - "storage.k8s.io"."v1beta1"."VolumeAttachment" = config."volumeattachments"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.11.nix b/modules/generated/v1.11.nix index 5c9ea35..1001a6a 100644 --- a/modules/generated/v1.11.nix +++ b/modules/generated/v1.11.nix @@ -30014,104 +30014,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1"."DaemonSet" = config."daemonsets"; - - "apps"."v1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "autoscaling"."v2beta1"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "admissionregistration.k8s.io"."v1beta1"."MutatingWebhookConfiguration" = config."mutatingwebhookconfigurations"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1beta1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - - "admissionregistration.k8s.io"."v1beta1"."ValidatingWebhookConfiguration" = config."validatingwebhookconfigurations"; - - "storage.k8s.io"."v1beta1"."VolumeAttachment" = config."volumeattachments"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.12.nix b/modules/generated/v1.12.nix index dd5d3db..7492d99 100644 --- a/modules/generated/v1.12.nix +++ b/modules/generated/v1.12.nix @@ -30811,106 +30811,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1"."DaemonSet" = config."daemonsets"; - - "apps"."v1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "autoscaling"."v2beta2"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "coordination.k8s.io"."v1beta1"."Lease" = config."leases"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "admissionregistration.k8s.io"."v1beta1"."MutatingWebhookConfiguration" = config."mutatingwebhookconfigurations"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1beta1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - - "admissionregistration.k8s.io"."v1beta1"."ValidatingWebhookConfiguration" = config."validatingwebhookconfigurations"; - - "storage.k8s.io"."v1beta1"."VolumeAttachment" = config."volumeattachments"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.13.nix b/modules/generated/v1.13.nix index bc87db5..b08fbca 100644 --- a/modules/generated/v1.13.nix +++ b/modules/generated/v1.13.nix @@ -31429,108 +31429,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1"."APIService" = config."apiservices"; - - "auditregistration.k8s.io"."v1alpha1"."AuditSink" = config."auditsinks"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1"."DaemonSet" = config."daemonsets"; - - "apps"."v1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "autoscaling"."v2beta2"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "coordination.k8s.io"."v1beta1"."Lease" = config."leases"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "admissionregistration.k8s.io"."v1beta1"."MutatingWebhookConfiguration" = config."mutatingwebhookconfigurations"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1beta1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - - "admissionregistration.k8s.io"."v1beta1"."ValidatingWebhookConfiguration" = config."validatingwebhookconfigurations"; - - "storage.k8s.io"."v1"."VolumeAttachment" = config."volumeattachments"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.7.nix b/modules/generated/v1.7.nix index 7f761ff..996bd26 100644 --- a/modules/generated/v1.7.nix +++ b/modules/generated/v1.7.nix @@ -12613,96 +12613,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1beta1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1beta1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1beta1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1beta1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "extensions"."v1beta1"."DaemonSet" = config."daemonsets"; - - "apps"."v1beta1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "admissionregistration.k8s.io"."v1alpha1"."ExternalAdmissionHookConfiguration" = config."externaladmissionhookconfigurations"; - - "autoscaling"."v2alpha1"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "extensions"."v1beta1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1beta1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1beta1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1beta1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "extensions"."v1beta1"."ThirdPartyResource" = config."thirdpartyresources"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.8.nix b/modules/generated/v1.8.nix index 3aec318..b2870ba 100644 --- a/modules/generated/v1.8.nix +++ b/modules/generated/v1.8.nix @@ -26356,100 +26356,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1beta1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1beta2"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1beta2"."DaemonSet" = config."daemonsets"; - - "apps"."v1beta2"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "admissionregistration.k8s.io"."v1alpha1"."ExternalAdmissionHookConfiguration" = config."externaladmissionhookconfigurations"; - - "autoscaling"."v2beta1"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1alpha1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1beta2"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1beta2"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - } // { inherit definitions; resources = [{ diff --git a/modules/generated/v1.9.nix b/modules/generated/v1.9.nix index a02685d..ebbf93c 100644 --- a/modules/generated/v1.9.nix +++ b/modules/generated/v1.9.nix @@ -28483,104 +28483,6 @@ in { }; config = { - "apiregistration.k8s.io"."v1beta1"."APIService" = config."apiservices"; - - "core"."v1"."Binding" = config."bindings"; - - "certificates.k8s.io"."v1beta1"."CertificateSigningRequest" = config."certificatesigningrequests"; - - "rbac.authorization.k8s.io"."v1"."ClusterRole" = config."clusterroles"; - - "rbac.authorization.k8s.io"."v1"."ClusterRoleBinding" = config."clusterrolebindings"; - - "core"."v1"."ConfigMap" = config."configmaps"; - - "apps"."v1"."ControllerRevision" = config."controllerrevisions"; - - "batch"."v2alpha1"."CronJob" = config."cronjobs"; - - "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = config."customresourcedefinitions"; - - "apps"."v1"."DaemonSet" = config."daemonsets"; - - "apps"."v1"."Deployment" = config."deployments"; - - "apps"."v1beta1"."DeploymentRollback" = config."rollback"; - - "core"."v1"."Endpoints" = config."endpoints"; - - "core"."v1"."Event" = config."events"; - - "policy"."v1beta1"."Eviction" = config."eviction"; - - "autoscaling"."v2beta1"."HorizontalPodAutoscaler" = config."horizontalpodautoscalers"; - - "extensions"."v1beta1"."Ingress" = config."ingresses"; - - "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = config."initializerconfigurations"; - - "batch"."v1"."Job" = config."jobs"; - - "core"."v1"."LimitRange" = config."limitranges"; - - "authorization.k8s.io"."v1"."LocalSubjectAccessReview" = config."localsubjectaccessreviews"; - - "admissionregistration.k8s.io"."v1beta1"."MutatingWebhookConfiguration" = config."mutatingwebhookconfigurations"; - - "core"."v1"."Namespace" = config."namespaces"; - - "networking.k8s.io"."v1"."NetworkPolicy" = config."networkpolicies"; - - "core"."v1"."Node" = config."nodes"; - - "core"."v1"."PersistentVolume" = config."persistentvolumes"; - - "core"."v1"."PersistentVolumeClaim" = config."persistentvolumeclaims"; - - "core"."v1"."Pod" = config."pods"; - - "policy"."v1beta1"."PodDisruptionBudget" = config."poddisruptionbudgets"; - - "settings.k8s.io"."v1alpha1"."PodPreset" = config."podpresets"; - - "extensions"."v1beta1"."PodSecurityPolicy" = config."podsecuritypolicies"; - - "core"."v1"."PodTemplate" = config."podtemplates"; - - "scheduling.k8s.io"."v1alpha1"."PriorityClass" = config."priorityclasses"; - - "apps"."v1"."ReplicaSet" = config."replicasets"; - - "core"."v1"."ReplicationController" = config."replicationcontrollers"; - - "core"."v1"."ResourceQuota" = config."resourcequotas"; - - "rbac.authorization.k8s.io"."v1"."Role" = config."roles"; - - "rbac.authorization.k8s.io"."v1"."RoleBinding" = config."rolebindings"; - - "core"."v1"."Secret" = config."secrets"; - - "authorization.k8s.io"."v1"."SelfSubjectAccessReview" = config."selfsubjectaccessreviews"; - - "authorization.k8s.io"."v1"."SelfSubjectRulesReview" = config."selfsubjectrulesreviews"; - - "core"."v1"."Service" = config."services"; - - "core"."v1"."ServiceAccount" = config."serviceaccounts"; - - "apps"."v1"."StatefulSet" = config."statefulsets"; - - "storage.k8s.io"."v1"."StorageClass" = config."storageclasses"; - - "authorization.k8s.io"."v1"."SubjectAccessReview" = config."subjectaccessreviews"; - - "authentication.k8s.io"."v1"."TokenReview" = config."tokenreviews"; - - "admissionregistration.k8s.io"."v1beta1"."ValidatingWebhookConfiguration" = config."validatingwebhookconfigurations"; - - "storage.k8s.io"."v1alpha1"."VolumeAttachment" = config."volumeattachments"; - } // { inherit definitions; resources = [{ diff --git a/modules/k8s.nix b/modules/k8s.nix index d315c4c..64fac89 100644 --- a/modules/k8s.nix +++ b/modules/k8s.nix @@ -19,7 +19,7 @@ let moduleToAttrs = value: if isAttrs value - then mapAttrs (n: v: moduleToAttrs v) (filterAttrs (n: v: !(hasPrefix "_" n) && v != null) value) + then mapAttrs (n: v: moduleToAttrs v) (filterAttrs (n: v: v != null && !(hasPrefix "_" n)) value) else if isList value then map (v: moduleToAttrs v) value @@ -257,7 +257,7 @@ in { if elem r1.kind cfg.resourceOrder && elem r2.kind cfg.resourceOrder then indexOf cfg.resourceOrder r1.kind < indexOf cfg.resourceOrder r2.kind else if elem r1.kind cfg.resourceOrder then true else false - ) (moduleToAttrs (unique items)); + ) (unique items); default = []; }; @@ -285,6 +285,12 @@ in { ) cfg.api.${gvk.group}.${gvk.version}.${gvk.kind} ) cfg.api.resources)) + (flatten (map (gvk: + mapAttrsToList (name: resource: + moduleToAttrs resource + ) cfg.api.${gvk.resource} + ) cfg.api.resources)) + # passthru of child kubernetes objects if passthru is enabled on submodule # and submodule has k8s module loaded (flatten (mapAttrsToList (_: submodule: