From 8336034aa842ad0ac1f7a787a771102242300bf0 Mon Sep 17 00:00:00 2001 From: Felix Scheinost Date: Wed, 8 Nov 2023 15:56:09 +0100 Subject: [PATCH] Fix default of `helm.releases.<>.apiVersions` The previous value included only the `.`, e.g. `monitoring.coreos.com/v1`. But Helm charts actually also check for e.g. `monitoring.coreos.com/v1/ServiceMonitor`. For this reason we need both. --- modules/helm.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/helm.nix b/modules/helm.nix index 10a5981..52db0de 100644 --- a/modules/helm.nix +++ b/modules/helm.nix @@ -106,7 +106,12 @@ in If you use `kubernetes.customTypes` to make kubenix aware of CRDs, it will include those as well by default. ''; type = types.listOf types.str; - default = builtins.map (customType: "${customType.group}/${customType.version}") + default = builtins.concatMap + (customType: + [ + "${customType.group}/${customType.version}" + "${customType.group}/${customType.version}/${customType.kind}" + ]) (builtins.attrValues globalConfig.kubernetes.customTypes); };