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

fix(k8s): crd, pass module into spec instead of root

Browse source
This commit is contained in:
Jaka Hudoklin 2019-02-11 21:20:45 +01:00
parent 3dc1e615c4
commit 606dbc2082
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
k8s/default.nix
View file

@ -88,8 +88,6 @@ in {
options.${cr.group}.${cr.version}.${cr.kind} = mkOption { options.${cr.group}.${cr.version}.${cr.kind} = mkOption {
description = cr.description; description = cr.description;
type = types.attrsOf (types.submodule ({name, ...}: { type = types.attrsOf (types.submodule ({name, ...}: {
imports = [cr.module];
options = { options = {
apiVersion = mkOption { apiVersion = mkOption {
description = "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"; description = "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources";
@ -105,6 +103,12 @@ in {
description = "Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata."; description = "Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata.";
type = types.nullOr (types.submodule config.definitions."io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"); type = types.nullOr (types.submodule config.definitions."io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta");
}; };
spec = mkOption {
description = "Module spec";
type = types.submodule cr.module;
default = {};
};
}; };
config = mkMerge ([{ config = mkMerge ([{