From 3f3b925f966a64e2cb4dbb40b66004399fd299d9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 15 Jan 2020 08:50:04 +0000 Subject: [PATCH] fix(generators/k8s): prefer beta resources over alpha --- generators/k8s/default.nix | 12 ++++++++---- modules/generated/v1.10.nix | 6 +++--- modules/generated/v1.11.nix | 6 +++--- modules/generated/v1.12.nix | 6 +++--- modules/generated/v1.13.nix | 6 +++--- modules/generated/v1.14.nix | 6 +++--- modules/generated/v1.15.nix | 6 +++--- modules/generated/v1.7.nix | 9 ++++----- modules/generated/v1.8.nix | 6 +++--- modules/generated/v1.9.nix | 6 +++--- 10 files changed, 36 insertions(+), 33 deletions(-) diff --git a/generators/k8s/default.nix b/generators/k8s/default.nix index de99e33..306c33a 100644 --- a/generators/k8s/default.nix +++ b/generators/k8s/default.nix @@ -85,11 +85,15 @@ let compareVersions = ver1: ver2: let getVersion = v: substring 1 10 v; - splittedVer1 = builtins.splitVersion (getVersion ver1); - splittedVer2 = builtins.splitVersion (getVersion ver2); + splitVersion = v: builtins.splitVersion (getVersion v); + 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; - v2 = if length splittedVer2 == 1 then "${getVersion ver2}prod" else getVersion ver2; + v1 = patchVersion ver1; + v2 = patchVersion ver2; in builtins.compareVersions v1 v2; fixJSON = content: replaceStrings ["\\u"] ["u"] content; diff --git a/modules/generated/v1.10.nix b/modules/generated/v1.10.nix index e492181..7b4f8b6 100755 --- a/modules/generated/v1.10.nix +++ b/modules/generated/v1.10.nix @@ -27968,8 +27968,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -28902,7 +28902,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.11.nix b/modules/generated/v1.11.nix index f90152a..1e7eae8 100755 --- a/modules/generated/v1.11.nix +++ b/modules/generated/v1.11.nix @@ -28513,8 +28513,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -29454,7 +29454,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.12.nix b/modules/generated/v1.12.nix index f4bca0c..a855541 100755 --- a/modules/generated/v1.12.nix +++ b/modules/generated/v1.12.nix @@ -29269,8 +29269,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -30231,7 +30231,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.13.nix b/modules/generated/v1.13.nix index e6a97c7..282f4b6 100755 --- a/modules/generated/v1.13.nix +++ b/modules/generated/v1.13.nix @@ -29911,8 +29911,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -30889,7 +30889,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.14.nix b/modules/generated/v1.14.nix index 71b6dee..2f089e5 100644 --- a/modules/generated/v1.14.nix +++ b/modules/generated/v1.14.nix @@ -20436,8 +20436,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -21458,7 +21458,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.15.nix b/modules/generated/v1.15.nix index 8a3275c..9f416e6 100644 --- a/modules/generated/v1.15.nix +++ b/modules/generated/v1.15.nix @@ -20778,8 +20778,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -21800,7 +21800,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.7.nix b/modules/generated/v1.7.nix index 153d8ee..7117eec 100755 --- a/modules/generated/v1.7.nix +++ b/modules/generated/v1.7.nix @@ -12173,11 +12173,10 @@ in { default = { }; }; "horizontalPodAutoscalers" = mkOption { - description = - "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."; + description = "configuration of a horizontal pod autoscaler."; type = (types.attrsOf (submoduleForDefinition - "io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscaler" - "horizontalpodautoscalers" "HorizontalPodAutoscaler" "autoscaling" "v2alpha1")); + "io.k8s.kubernetes.pkg.apis.autoscaling.v1.HorizontalPodAutoscaler" + "horizontalpodautoscalers" "HorizontalPodAutoscaler" "autoscaling" "v1")); default = { }; }; "ingresses" = mkOption { @@ -12850,7 +12849,7 @@ in { "policy"."v1beta1"."Eviction" = mkAliasDefinitions options.resources."eviction"; "admissionregistration.k8s.io"."v1alpha1"."ExternalAdmissionHookConfiguration" = mkAliasDefinitions options.resources."externalAdmissionHookConfigurations"; - "autoscaling"."v2alpha1"."HorizontalPodAutoscaler" = + "autoscaling"."v1"."HorizontalPodAutoscaler" = mkAliasDefinitions options.resources."horizontalPodAutoscalers"; "extensions"."v1beta1"."Ingress" = mkAliasDefinitions options.resources."ingresses"; "admissionregistration.k8s.io"."v1alpha1"."InitializerConfiguration" = diff --git a/modules/generated/v1.8.nix b/modules/generated/v1.8.nix index f534628..758986d 100755 --- a/modules/generated/v1.8.nix +++ b/modules/generated/v1.8.nix @@ -24992,8 +24992,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -25830,7 +25830,7 @@ in { "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "apps"."v1beta2"."ControllerRevision" = mkAliasDefinitions options.resources."controllerRevisions"; - "batch"."v2alpha1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; + "batch"."v1beta1"."CronJob" = mkAliasDefinitions options.resources."cronJobs"; "apiextensions.k8s.io"."v1beta1"."CustomResourceDefinition" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1beta2"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets"; diff --git a/modules/generated/v1.9.nix b/modules/generated/v1.9.nix index f014a2f..04a54f7 100755 --- a/modules/generated/v1.9.nix +++ b/modules/generated/v1.9.nix @@ -27005,8 +27005,8 @@ in { "cronJobs" = mkOption { description = "CronJob represents the configuration of a single cron job."; type = (types.attrsOf - (submoduleForDefinition "io.k8s.api.batch.v2alpha1.CronJob" "cronjobs" "CronJob" "batch" - "v2alpha1")); + (submoduleForDefinition "io.k8s.api.batch.v1beta1.CronJob" "cronjobs" "CronJob" "batch" + "v1beta1")); default = { }; }; "customResourceDefinitions" = mkOption { @@ -27918,7 +27918,7 @@ in { mkAliasDefinitions options.resources."clusterRoleBindings"; "core"."v1"."ConfigMap" = mkAliasDefinitions options.resources."configMaps"; "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" = mkAliasDefinitions options.resources."customResourceDefinitions"; "apps"."v1"."DaemonSet" = mkAliasDefinitions options.resources."daemonSets";