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

fix(generators/k8s): prefer beta resources over alpha

Browse source
This commit is contained in:
Jaka Hudoklin 2020-01-15 08:50:04 +00:00
parent 33d797dae8
commit 3f3b925f96
No known key found for this signature in database
GPG key ID: D1F18234B07BD6E2
10 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
generators/k8s/default.nix
View file

@ -85,11 +85,15 @@ let
compareVersions = ver1: ver2: let compareVersions = ver1: ver2: let
getVersion = v: substring 1 10 v; getVersion = v: substring 1 10 v;
splittedVer1 = builtins.splitVersion (getVersion ver1); splitVersion = v: builtins.splitVersion (getVersion v);
splittedVer2 = builtins.splitVersion (getVersion ver2); isAlpha = v: elem "alpha" (splitVersion v);
patchVersion = v:
if isAlpha v then ""
else if length (splitVersion v) == 1 then "${getVersion v}prod"
else getVersion v;
v1 = if length splittedVer1 == 1 then "${getVersion ver1}prod" else getVersion ver1; v1 = patchVersion ver1;
v2 = if length splittedVer2 == 1 then "${getVersion ver2}prod" else getVersion ver2; v2 = patchVersion ver2;
in builtins.compareVersions v1 v2; in builtins.compareVersions v1 v2;
fixJSON = content: replaceStrings ["\\u"] ["u"] content; fixJSON = content: replaceStrings ["\\u"] ["u"] content;

6
modules/generated/v1.10.nix
View file

@ -27968,8 +27968,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -28902,7 +28902,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.11.nix
View file

@ -28513,8 +28513,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -29454,7 +29454,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.12.nix
View file

@ -29269,8 +29269,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -30231,7 +30231,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.13.nix
View file

@ -29911,8 +29911,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -30889,7 +30889,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.14.nix
View file

@ -20436,8 +20436,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -21458,7 +21458,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.15.nix
View file

@ -20778,8 +20778,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -21800,7 +21800,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

9
modules/generated/v1.7.nix
View file

@ -12173,11 +12173,10 @@ in {
default = { }; default = { };
}; };
"horizontalPodAutoscalers" = mkOption { "horizontalPodAutoscalers" = mkOption {
description = description = "configuration of a horizontal pod autoscaler.";
"HorizontalPodAutoscaler is the configuration for a horizontal pod autoscaler, which automatically manages the replica count of any resource implementing the scale subresource based on the metrics specified.";
type = (types.attrsOf (submoduleForDefinition type = (types.attrsOf (submoduleForDefinition
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscaler" "io.k8s.kubernetes.pkg.apis.autoscaling.v1.HorizontalPodAutoscaler"
"horizontalpodautoscalers" "HorizontalPodAutoscaler" "autoscaling" "v2alpha1")); "horizontalpodautoscalers" "HorizontalPodAutoscaler" "autoscaling" "v1"));
default = { }; default = { };
}; };
"ingresses" = mkOption { "ingresses" = mkOption {
@ -12850,7 +12849,7 @@ in {
"policy"."v1beta1"."Eviction" = mkAliasDefinitions options.resources."eviction"; "policy"."v1beta1"."Eviction" = mkAliasDefinitions options.resources."eviction";
"admissionregistration.k8s.io"."v1alpha1"."ExternalAdmissionHookConfiguration" = "admissionregistration.k8s.io"."v1alpha1"."ExternalAdmissionHookConfiguration" =
mkAliasDefinitions options.resources."externalAdmissionHookConfigurations"; mkAliasDefinitions options.resources."externalAdmissionHookConfigurations";
"autoscaling"."v2alpha1"."HorizontalPodAutoscaler" = "autoscaling"."v1"."HorizontalPodAutoscaler" =
mkAliasDefinitions options.resources."horizontalPodAutoscalers"; mkAliasDefinitions options.resources."horizontalPodAutoscalers";
"extensions"."v1beta1"."Ingress" = mkAliasDefinitions options.resources."ingresses"; "extensions"."v1beta1"."Ingress" = mkAliasDefinitions options.resources."ingresses";
"admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" =

6
modules/generated/v1.8.nix
View file

@ -24992,8 +24992,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -25830,7 +25830,7 @@ in {
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1beta2"."ControllerRevision" = "apps"."v1beta2"."ControllerRevision" =
mkAliasDefinitions options.resources."controllerRevisions"; mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1beta2"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1beta2"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";

6
modules/generated/v1.9.nix
View file

@ -27005,8 +27005,8 @@ in {
"cronJobs" = mkOption { "cronJobs" = mkOption {
description = "CronJob represents the configuration of a single cron job."; description = "CronJob represents the configuration of a single cron job.";
type = (types.attrsOf type = (types.attrsOf
(submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch"
"v2alpha1")); "v1beta1"));
default = { }; default = { };
}; };
"customResourceDefinitions" = mkOption { "customResourceDefinitions" = mkOption {
@ -27918,7 +27918,7 @@ in {
mkAliasDefinitions options.resources."clusterRoleBindings"; mkAliasDefinitions options.resources."clusterRoleBindings";
"core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps";
"apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; "apps"."v1"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions";
"batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs";
"apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" =
mkAliasDefinitions options.resources."customResourceDefinitions"; mkAliasDefinitions options.resources."customResourceDefinitions";
"apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";