From ddc42e61092f12daea9fb104f3433b14bff11dbe Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Wed, 8 Jan 2020 07:52:07 -0800 Subject: [PATCH] Change algorithm for prioritizing duplicate resources (#101) Now we place a higher priority on production/beta/alpha than we do on v2/v1 ... as requested by @amarrella --- README.md | 4 +-- defaults.dhall | 30 +++++++++++----------- dhall-kubernetes-generator/src/Main.hs | 4 +-- examples/aws-iam-authenticator-chart.dhall | 2 +- examples/deployment.dhall | 2 +- examples/deploymentSimple.dhall | 2 +- examples/ingress.dhall | 2 +- examples/service.dhall | 2 +- package.dhall | 6 ++--- schemas.dhall | 30 +++++++++++----------- types.dhall | 30 +++++++++++----------- typesUnion.dhall | 30 +++++++++++----------- 12 files changed, 72 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index f74a64e9..114b3cd5 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ In the following example, we: -- examples/deploymentSimple.dhall let kubernetes = - ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 + ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a let deployment = kubernetes.Deployment::{ @@ -152,7 +152,7 @@ let map = Prelude.List.map let kv = Prelude.JSON.keyText let kubernetes = - ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 + ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a let Service = { name : Text, host : Text, version : Text } diff --git a/defaults.dhall b/defaults.dhall index ea6d2456..1d81cdec 100644 --- a/defaults.dhall +++ b/defaults.dhall @@ -122,28 +122,28 @@ ./defaults/io.k8s.api.authorization.v1.SubjectAccessReviewStatus.dhall sha256:fcd839dac5487cfbcbfbe8eca4922bf484f7e6e46a6f88598e78bbe558bc3b9a , SubjectRulesReviewStatus = ./defaults/io.k8s.api.authorization.v1.SubjectRulesReviewStatus.dhall sha256:85e4fa1752fd9b86c8195b4fcefeea7a9d36e61c22db395f59fc9097162444f0 +, CrossVersionObjectReference = + ./defaults/io.k8s.api.autoscaling.v1.CrossVersionObjectReference.dhall sha256:9bb9dcb5bf6f795291686f59383bcd01c8e79b87fc3fb63351d46dea100ac51b +, HorizontalPodAutoscaler = + ./defaults/io.k8s.api.autoscaling.v1.HorizontalPodAutoscaler.dhall sha256:e3845fbf913dc1c05d3bcd814ad4ca19be57158acb5af73cd816600bf20b24ba +, HorizontalPodAutoscalerList = + ./defaults/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerList.dhall sha256:5de497e492a0e355b763b179e6c0ad121c0f48248b27d42853aa71e1bc0256ee +, HorizontalPodAutoscalerSpec = + ./defaults/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerSpec.dhall sha256:1091aeec18d68ae2ecd270860349efe392a6b0cfb2f90dfc6c8b32b1776e6d1e +, HorizontalPodAutoscalerStatus = + ./defaults/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerStatus.dhall sha256:323797f9c67ef3e9c5fde42347abcdf8a55fa9e7de0b62e1d141ce1e9fe21995 , Scale = ./defaults/io.k8s.api.autoscaling.v1.Scale.dhall sha256:893084f6f23ddf4b8d849789edc182a68f91f4c42a2b6f15fe6802ac932fe476 , ScaleSpec = ./defaults/io.k8s.api.autoscaling.v1.ScaleSpec.dhall sha256:62ed60d23f95d26219c64410857bba02b39e118e8ac106528eceb8ae1d8c93e3 , ScaleStatus = ./defaults/io.k8s.api.autoscaling.v1.ScaleStatus.dhall sha256:378366369e27427f71184050ac6666edc8c423954510952d39248ebce88acc42 -, CrossVersionObjectReference = - ./defaults/io.k8s.api.autoscaling.v2beta2.CrossVersionObjectReference.dhall sha256:9bb9dcb5bf6f795291686f59383bcd01c8e79b87fc3fb63351d46dea100ac51b , ExternalMetricSource = ./defaults/io.k8s.api.autoscaling.v2beta2.ExternalMetricSource.dhall sha256:48114ac50415ff4d051a4e57423a2f4e7b12398749825f5625697c3d2c8897ca , ExternalMetricStatus = ./defaults/io.k8s.api.autoscaling.v2beta2.ExternalMetricStatus.dhall sha256:02e4e6fed3ab9c115a0907b2968148d606dc653c55817df20d3fc0261d4ebf5e -, HorizontalPodAutoscaler = - ./defaults/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscaler.dhall sha256:7964da4e2878e0f5e556d3c30a39c3abe8822774e6caf1fd90d9183dcaa30e30 , HorizontalPodAutoscalerCondition = ./defaults/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 -, HorizontalPodAutoscalerList = - ./defaults/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerList.dhall sha256:24f5bb960da51a83664df42da3ccf9f95aed29214df0322d6fdc8b28ab406688 -, HorizontalPodAutoscalerSpec = - ./defaults/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerSpec.dhall sha256:fe6875b9e4725712d446702070da05d0bfc35fd735c2ec49f9320c35afabe5af -, HorizontalPodAutoscalerStatus = - ./defaults/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerStatus.dhall sha256:cbff68bb1ea938da5f918d0e5680339980ba8376abece6f1953dd3bde2ecadea , MetricIdentifier = ./defaults/io.k8s.api.autoscaling.v2beta2.MetricIdentifier.dhall sha256:24b233185318f27e20efb775ea6e180fe9f85b972467cb291cf3721a13ce3d67 , MetricSpec = @@ -177,15 +177,15 @@ , JobStatus = ./defaults/io.k8s.api.batch.v1.JobStatus.dhall sha256:a8d8e591e2fe1686c47015ccb1ec4d526b2556e393d2971d9df4f2d670c66f1e , CronJob = - ./defaults/io.k8s.api.batch.v2alpha1.CronJob.dhall sha256:2b36c2d2b7020a85d1733bdbc8f15e5371aebb9c8b3dc61be2b52f9b5b9b8b8a + ./defaults/io.k8s.api.batch.v1beta1.CronJob.dhall sha256:2bef4189ab119a583247910482ff7d6c6ea39993be1db850eb17993efe6c9f55 , CronJobList = - ./defaults/io.k8s.api.batch.v2alpha1.CronJobList.dhall sha256:26b1a6178d077df37f6c41e63db0b3a13f25be586eb3cafc112ba1215547ff26 + ./defaults/io.k8s.api.batch.v1beta1.CronJobList.dhall sha256:7b8b56168421758c086940d5c603d40d45e69a6e8b2033078552ebd6f034822e , CronJobSpec = - ./defaults/io.k8s.api.batch.v2alpha1.CronJobSpec.dhall sha256:d201ac1de16f2ba23aa937ddc73cfcd36cd589e0b3b87e4e33674d3796458365 + ./defaults/io.k8s.api.batch.v1beta1.CronJobSpec.dhall sha256:d201ac1de16f2ba23aa937ddc73cfcd36cd589e0b3b87e4e33674d3796458365 , CronJobStatus = - ./defaults/io.k8s.api.batch.v2alpha1.CronJobStatus.dhall sha256:74d9ee0419f4a414496b1195a1fa782696a07d131edf8194fa2d3dae5253a70b + ./defaults/io.k8s.api.batch.v1beta1.CronJobStatus.dhall sha256:74d9ee0419f4a414496b1195a1fa782696a07d131edf8194fa2d3dae5253a70b , JobTemplateSpec = - ./defaults/io.k8s.api.batch.v2alpha1.JobTemplateSpec.dhall sha256:2aa234045f2a2860acab9030495473ebade2ab3afd0f7b70d10fd9f8f96cb6bd + ./defaults/io.k8s.api.batch.v1beta1.JobTemplateSpec.dhall sha256:2aa234045f2a2860acab9030495473ebade2ab3afd0f7b70d10fd9f8f96cb6bd , CertificateSigningRequest = ./defaults/io.k8s.api.certificates.v1beta1.CertificateSigningRequest.dhall sha256:0a30b01a87e0bf3f0e083ed5ed55eb6ba6f8d3f4b9c3fc29c1268268fe8ba9b9 , CertificateSigningRequestCondition = diff --git a/dhall-kubernetes-generator/src/Main.hs b/dhall-kubernetes-generator/src/Main.hs index 19ca945c..5bdd07d7 100644 --- a/dhall-kubernetes-generator/src/Main.hs +++ b/dhall-kubernetes-generator/src/Main.hs @@ -71,8 +71,8 @@ echoStr = echo . Text.pack data Stability = Alpha Natural | Beta Natural | Production deriving (Eq, Ord) data Version = Version - { version :: Natural - , stability :: Stability + { stability :: Stability + , version :: Natural } deriving (Eq, Ord) parseStability :: Parsec Void Text Stability diff --git a/examples/aws-iam-authenticator-chart.dhall b/examples/aws-iam-authenticator-chart.dhall index d66df8a6..f05d89ff 100644 --- a/examples/aws-iam-authenticator-chart.dhall +++ b/examples/aws-iam-authenticator-chart.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a + ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 let release = "wintering-rodent" diff --git a/examples/deployment.dhall b/examples/deployment.dhall index e63c87ce..086cbfd3 100644 --- a/examples/deployment.dhall +++ b/examples/deployment.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69 let kubernetes = - ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a + ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 let kv = Prelude.JSON.keyText diff --git a/examples/deploymentSimple.dhall b/examples/deploymentSimple.dhall index 05d835d9..8cb7390d 100644 --- a/examples/deploymentSimple.dhall +++ b/examples/deploymentSimple.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a + ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 let deployment = kubernetes.Deployment::{ diff --git a/examples/ingress.dhall b/examples/ingress.dhall index 865f3b04..e9c1bfb5 100644 --- a/examples/ingress.dhall +++ b/examples/ingress.dhall @@ -6,7 +6,7 @@ let map = Prelude.List.map let kv = Prelude.JSON.keyText let kubernetes = - ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a + ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 let Service = { name : Text, host : Text, version : Text } diff --git a/examples/service.dhall b/examples/service.dhall index afe30e32..eb7270d8 100644 --- a/examples/service.dhall +++ b/examples/service.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:771c7131fc87e13eb18f770a27c59f9418879f7e230ba2a50e46f4461f43ec69 let kubernetes = - ../package.dhall sha256:0a6949aabfb5a1250f08c4e3a533024d4705bea98ace08d8d107417e54a9648a + ../package.dhall sha256:63eb2e2bb9a50632801b673e67e666740c09c89deb0a0d0592d165178b5eba53 let kv = Prelude.JSON.keyText diff --git a/package.dhall b/package.dhall index 6a5affef..43485fc0 100644 --- a/package.dhall +++ b/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:4269707d831794c130dfc75b0e511e657356adcc46653cd4c22de8a6a7e66b65 + ./schemas.dhall sha256:bd5cfc1abae136959fc13c483d6ebe7ffef906dc23cdd5153cc57da9f6aa6fce ∧ { IntOrString = - ( ./types.dhall sha256:d750783ee3c79b2e932de83fdcae3a474532c8ca6b8dcab158c85123fe1fa69a + ( ./types.dhall sha256:59cfe76addc3e3be9c80a82f47e08aaee3b4ce8df11f57bf1800917ce709babe ).IntOrString , Resource = - ./typesUnion.dhall sha256:1bb630d6052145e99c243eb66a51f3572903e7d59e49174a9561311e85b4207a + ./typesUnion.dhall sha256:c861da8dcaa0d1b0f542fa8bb97536a746d3cc4d3d2e1284012be0596bc08c15 } diff --git a/schemas.dhall b/schemas.dhall index c66d10a4..7d1984ec 100644 --- a/schemas.dhall +++ b/schemas.dhall @@ -122,28 +122,28 @@ ./schemas/io.k8s.api.authorization.v1.SubjectAccessReviewStatus.dhall sha256:aa1517a18a2e66eef91f514a94a860c16d2147e870623acd32130c7610860feb , SubjectRulesReviewStatus = ./schemas/io.k8s.api.authorization.v1.SubjectRulesReviewStatus.dhall sha256:8072badcd57634bab650509608d78591b43b3bf2a3bb641d2b8f03a45a28943e +, CrossVersionObjectReference = + ./schemas/io.k8s.api.autoscaling.v1.CrossVersionObjectReference.dhall sha256:61ee2b43f8d51e3222dc6d83316419779f3a36b98042ae712460a19cd86a2347 +, HorizontalPodAutoscaler = + ./schemas/io.k8s.api.autoscaling.v1.HorizontalPodAutoscaler.dhall sha256:1c12117db5af6a95fe02d3f9ceb45918a06447c4994345248e67d2330ca2aa51 +, HorizontalPodAutoscalerList = + ./schemas/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerList.dhall sha256:1b9a7808077f9d805bd2c909a716f7f309abbcf4d1856b828e5d7c5799e4f6ba +, HorizontalPodAutoscalerSpec = + ./schemas/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerSpec.dhall sha256:7bdd2200459c5dece21d65fabce1b4ac35d47c29318396a087e81ae855c11b6f +, HorizontalPodAutoscalerStatus = + ./schemas/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerStatus.dhall sha256:bb91e3fc2c8a8f2dd8e4420d5171d62b7ac92629c6b92348e7e01424c862f515 , Scale = ./schemas/io.k8s.api.autoscaling.v1.Scale.dhall sha256:2cc527dcadf7163260837592450b712ed1d5172b7239ce29c7b8a744723bb4a1 , ScaleSpec = ./schemas/io.k8s.api.autoscaling.v1.ScaleSpec.dhall sha256:51a4621b41433470d447b9bfe24c268673b4ff46dd79e226adb82511268b214d , ScaleStatus = ./schemas/io.k8s.api.autoscaling.v1.ScaleStatus.dhall sha256:e18f9c9a292543e64df19c0de89e8f25c726d3cba0a90d2d21af7594312362b1 -, CrossVersionObjectReference = - ./schemas/io.k8s.api.autoscaling.v2beta2.CrossVersionObjectReference.dhall sha256:61ee2b43f8d51e3222dc6d83316419779f3a36b98042ae712460a19cd86a2347 , ExternalMetricSource = ./schemas/io.k8s.api.autoscaling.v2beta2.ExternalMetricSource.dhall sha256:d4948054853beb28d89357bf43f2d974f2bf85ba6b9bf316732d3fd65865b5a7 , ExternalMetricStatus = ./schemas/io.k8s.api.autoscaling.v2beta2.ExternalMetricStatus.dhall sha256:3812582929de3e1bcc4f30a742f7c4b7743b7d32cc4ab28692b41c3fd1fd523b -, HorizontalPodAutoscaler = - ./schemas/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscaler.dhall sha256:c14cb5cdbb1fc3c6e0e64c5b21830633b8f812462ac62f44f3516b2e7cea24b8 , HorizontalPodAutoscalerCondition = ./schemas/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d -, HorizontalPodAutoscalerList = - ./schemas/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerList.dhall sha256:ea60312713fdfc8f879e4a8dfb6705ab3ee366de2f9ca39924995bf581c887dd -, HorizontalPodAutoscalerSpec = - ./schemas/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerSpec.dhall sha256:3c02a6ad6b4896de9628d2b1fe222ccc03ecaf0e2901665f6cf14e0841419786 -, HorizontalPodAutoscalerStatus = - ./schemas/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerStatus.dhall sha256:5f258556fd7c8baa9b67d5f4e7968d423a648bb3194dd242e4832876753d63d1 , MetricIdentifier = ./schemas/io.k8s.api.autoscaling.v2beta2.MetricIdentifier.dhall sha256:cf8b4097ddecc1e930a19bdd19ab1be580e12b3cfb0d7d938a19471068401565 , MetricSpec = @@ -177,15 +177,15 @@ , JobStatus = ./schemas/io.k8s.api.batch.v1.JobStatus.dhall sha256:aac9bd4f987b2e8705d0795ebed197f46a8da1224c0f78c0391cc6ac93f373f2 , CronJob = - ./schemas/io.k8s.api.batch.v2alpha1.CronJob.dhall sha256:6b985debf948a9de7271df0e7f83cd979a19808877a15f7fad4622b70dcb7fef + ./schemas/io.k8s.api.batch.v1beta1.CronJob.dhall sha256:b7bc2521ef3857101360e4df97030d694617ff14dd3bf3f91bc39a871e3d15dd , CronJobList = - ./schemas/io.k8s.api.batch.v2alpha1.CronJobList.dhall sha256:6bff4ea8ca7fd1ccb6055183985de7b3e976f2df1aa68df8ba23ad32d0a973f7 + ./schemas/io.k8s.api.batch.v1beta1.CronJobList.dhall sha256:418d08e5947d5692f98b7a4bd3d794ae618dbd182b901180f38fe6f80e52744f , CronJobSpec = - ./schemas/io.k8s.api.batch.v2alpha1.CronJobSpec.dhall sha256:d1597da01ef47707d78e28e60812064bbdd7daadbd2e7dafcba6ca364b0b2608 + ./schemas/io.k8s.api.batch.v1beta1.CronJobSpec.dhall sha256:d1597da01ef47707d78e28e60812064bbdd7daadbd2e7dafcba6ca364b0b2608 , CronJobStatus = - ./schemas/io.k8s.api.batch.v2alpha1.CronJobStatus.dhall sha256:8a7e5324c4646d2bab98c167e1d852ddb57a3bb70b4b460e6afd3df1b5d8230f + ./schemas/io.k8s.api.batch.v1beta1.CronJobStatus.dhall sha256:8a7e5324c4646d2bab98c167e1d852ddb57a3bb70b4b460e6afd3df1b5d8230f , JobTemplateSpec = - ./schemas/io.k8s.api.batch.v2alpha1.JobTemplateSpec.dhall sha256:a3f9572614ac05a8677d2c380b386e893def93b926953f2f4b6d5c67ba9e7b96 + ./schemas/io.k8s.api.batch.v1beta1.JobTemplateSpec.dhall sha256:a3f9572614ac05a8677d2c380b386e893def93b926953f2f4b6d5c67ba9e7b96 , CertificateSigningRequest = ./schemas/io.k8s.api.certificates.v1beta1.CertificateSigningRequest.dhall sha256:eaec89d2d04bf1ff4318c434ea7d883be7055bde6e3a9c11fce6ef8bd9191afc , CertificateSigningRequestCondition = diff --git a/types.dhall b/types.dhall index 6ecd7103..782810a5 100644 --- a/types.dhall +++ b/types.dhall @@ -122,28 +122,28 @@ ./types/io.k8s.api.authorization.v1.SubjectAccessReviewStatus.dhall sha256:d6afe026d4ec57c4c153a312ab04cede25fdf55eabdbcfc3b530da0a80c1de75 , SubjectRulesReviewStatus = ./types/io.k8s.api.authorization.v1.SubjectRulesReviewStatus.dhall sha256:22cfcb8b031715edd1143893462e9108ed4feb3d8f458ff1ab2e5dfced4d9c92 +, CrossVersionObjectReference = + ./types/io.k8s.api.autoscaling.v1.CrossVersionObjectReference.dhall sha256:686a8f9a56cb0e403746b5c80b3e8238f51e16138f95e7fd8c3a59f75912fb2d +, HorizontalPodAutoscaler = + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscaler.dhall sha256:b6f47e7c0b6337589a4f4e66798862c711ad82361d49d3d82ca4a4bcb6f0cf53 +, HorizontalPodAutoscalerList = + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerList.dhall sha256:6994ceec3403412e96147e229ad764d8bf45787c737c70d43390333f73e3fe37 +, HorizontalPodAutoscalerSpec = + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerSpec.dhall sha256:b4692ebca6d40939232c62f1f36ae93af89f950e86fbf643faf1064d10273db2 +, HorizontalPodAutoscalerStatus = + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerStatus.dhall sha256:ffdb1a0a7fb8f47a133137b49e971e2d368094b68ae60bdcb2c55b55d349e7cf , Scale = ./types/io.k8s.api.autoscaling.v1.Scale.dhall sha256:dc55d2360f1e2f7bee724a9fb449834afd5f0e90dc7961c79a22f8cea269d959 , ScaleSpec = ./types/io.k8s.api.autoscaling.v1.ScaleSpec.dhall sha256:7dc1170369dcc8e6fa340047e95c4660e405fac1b7f7da3a0d6edf01ac06f75a , ScaleStatus = ./types/io.k8s.api.autoscaling.v1.ScaleStatus.dhall sha256:d76d78afa568044a4282306ada81504a5d800bc79be897cef1d388fc40903cdb -, CrossVersionObjectReference = - ./types/io.k8s.api.autoscaling.v2beta2.CrossVersionObjectReference.dhall sha256:686a8f9a56cb0e403746b5c80b3e8238f51e16138f95e7fd8c3a59f75912fb2d , ExternalMetricSource = ./types/io.k8s.api.autoscaling.v2beta2.ExternalMetricSource.dhall sha256:daa1b43f5e6153f4be85bc5c1f2b42f1ae12ccab97ee50a5cb762a95e22e8cf2 , ExternalMetricStatus = ./types/io.k8s.api.autoscaling.v2beta2.ExternalMetricStatus.dhall sha256:51581a0e11c1cdfe29080dd00adc4864ba10aaff2ab1f997b29f94eb16a2ee0b -, HorizontalPodAutoscaler = - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscaler.dhall sha256:5327178bcf498a147672ea7fe1580b2301496f01036f7edf315e9452b2d6a40c , HorizontalPodAutoscalerCondition = ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d -, HorizontalPodAutoscalerList = - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerList.dhall sha256:18f7cdd03e8fe5eb4b4063ddf782f4d41534245326ce0fc78c6269c117de0dd4 -, HorizontalPodAutoscalerSpec = - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerSpec.dhall sha256:641f88d29dbfb2f500f0ce8b3515ac313d496de57fbe89d0c6e0dd41fae6d7c2 -, HorizontalPodAutoscalerStatus = - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerStatus.dhall sha256:505e3b01a2e3883b4dd0b5c6352fe3ee014b345b923558b22ac267e4ba55598b , MetricIdentifier = ./types/io.k8s.api.autoscaling.v2beta2.MetricIdentifier.dhall sha256:1fd0bd1aca4c86dd25a86802ed4bdf5bd13ff3c923ee8fe09ee3fe5037c5ff14 , MetricSpec = @@ -177,15 +177,15 @@ , JobStatus = ./types/io.k8s.api.batch.v1.JobStatus.dhall sha256:f9ea74adce4426e2277120d8427b62ca553e6a57274469139665a59801f8e1cd , CronJob = - ./types/io.k8s.api.batch.v2alpha1.CronJob.dhall sha256:1b69374e7d3b203f11737be704442167e0ea3de1f6a5390508416bb7fa74a6b2 + ./types/io.k8s.api.batch.v1beta1.CronJob.dhall sha256:1b69374e7d3b203f11737be704442167e0ea3de1f6a5390508416bb7fa74a6b2 , CronJobList = - ./types/io.k8s.api.batch.v2alpha1.CronJobList.dhall sha256:5e56f77f4bb3c3b6b7313b6bf78a2af4520e917d2e0c9685d90d0bce3543a213 + ./types/io.k8s.api.batch.v1beta1.CronJobList.dhall sha256:5e56f77f4bb3c3b6b7313b6bf78a2af4520e917d2e0c9685d90d0bce3543a213 , CronJobSpec = - ./types/io.k8s.api.batch.v2alpha1.CronJobSpec.dhall sha256:c51f71a4cdfa751236203b7c8b173636356b9b5b8b5a24d35196fea1b8f01218 + ./types/io.k8s.api.batch.v1beta1.CronJobSpec.dhall sha256:c51f71a4cdfa751236203b7c8b173636356b9b5b8b5a24d35196fea1b8f01218 , CronJobStatus = - ./types/io.k8s.api.batch.v2alpha1.CronJobStatus.dhall sha256:bde64bf966a728236e65593d21075a7f13c954793b7676d628b53594c2619b92 + ./types/io.k8s.api.batch.v1beta1.CronJobStatus.dhall sha256:bde64bf966a728236e65593d21075a7f13c954793b7676d628b53594c2619b92 , JobTemplateSpec = - ./types/io.k8s.api.batch.v2alpha1.JobTemplateSpec.dhall sha256:35df6b5c77f77cce9e11aeaebdb481499437c9d3aad6c57e4ad95232e17c41f6 + ./types/io.k8s.api.batch.v1beta1.JobTemplateSpec.dhall sha256:35df6b5c77f77cce9e11aeaebdb481499437c9d3aad6c57e4ad95232e17c41f6 , CertificateSigningRequest = ./types/io.k8s.api.certificates.v1beta1.CertificateSigningRequest.dhall sha256:90ca6e0524fbc7f112049b991c3f29c230b19545b4ed4a8574d43b68d66543ae , CertificateSigningRequestCondition = diff --git a/typesUnion.dhall b/typesUnion.dhall index 8059a95a..cc4e4bcb 100644 --- a/typesUnion.dhall +++ b/typesUnion.dhall @@ -122,28 +122,28 @@ ./types/io.k8s.api.authorization.v1.SubjectAccessReviewStatus.dhall sha256:d6afe026d4ec57c4c153a312ab04cede25fdf55eabdbcfc3b530da0a80c1de75 | SubjectRulesReviewStatus : ./types/io.k8s.api.authorization.v1.SubjectRulesReviewStatus.dhall sha256:22cfcb8b031715edd1143893462e9108ed4feb3d8f458ff1ab2e5dfced4d9c92 +| CrossVersionObjectReference : + ./types/io.k8s.api.autoscaling.v1.CrossVersionObjectReference.dhall sha256:686a8f9a56cb0e403746b5c80b3e8238f51e16138f95e7fd8c3a59f75912fb2d +| HorizontalPodAutoscaler : + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscaler.dhall sha256:b6f47e7c0b6337589a4f4e66798862c711ad82361d49d3d82ca4a4bcb6f0cf53 +| HorizontalPodAutoscalerList : + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerList.dhall sha256:6994ceec3403412e96147e229ad764d8bf45787c737c70d43390333f73e3fe37 +| HorizontalPodAutoscalerSpec : + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerSpec.dhall sha256:b4692ebca6d40939232c62f1f36ae93af89f950e86fbf643faf1064d10273db2 +| HorizontalPodAutoscalerStatus : + ./types/io.k8s.api.autoscaling.v1.HorizontalPodAutoscalerStatus.dhall sha256:ffdb1a0a7fb8f47a133137b49e971e2d368094b68ae60bdcb2c55b55d349e7cf | Scale : ./types/io.k8s.api.autoscaling.v1.Scale.dhall sha256:dc55d2360f1e2f7bee724a9fb449834afd5f0e90dc7961c79a22f8cea269d959 | ScaleSpec : ./types/io.k8s.api.autoscaling.v1.ScaleSpec.dhall sha256:7dc1170369dcc8e6fa340047e95c4660e405fac1b7f7da3a0d6edf01ac06f75a | ScaleStatus : ./types/io.k8s.api.autoscaling.v1.ScaleStatus.dhall sha256:d76d78afa568044a4282306ada81504a5d800bc79be897cef1d388fc40903cdb -| CrossVersionObjectReference : - ./types/io.k8s.api.autoscaling.v2beta2.CrossVersionObjectReference.dhall sha256:686a8f9a56cb0e403746b5c80b3e8238f51e16138f95e7fd8c3a59f75912fb2d | ExternalMetricSource : ./types/io.k8s.api.autoscaling.v2beta2.ExternalMetricSource.dhall sha256:daa1b43f5e6153f4be85bc5c1f2b42f1ae12ccab97ee50a5cb762a95e22e8cf2 | ExternalMetricStatus : ./types/io.k8s.api.autoscaling.v2beta2.ExternalMetricStatus.dhall sha256:51581a0e11c1cdfe29080dd00adc4864ba10aaff2ab1f997b29f94eb16a2ee0b -| HorizontalPodAutoscaler : - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscaler.dhall sha256:5327178bcf498a147672ea7fe1580b2301496f01036f7edf315e9452b2d6a40c | HorizontalPodAutoscalerCondition : ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d -| HorizontalPodAutoscalerList : - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerList.dhall sha256:18f7cdd03e8fe5eb4b4063ddf782f4d41534245326ce0fc78c6269c117de0dd4 -| HorizontalPodAutoscalerSpec : - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerSpec.dhall sha256:641f88d29dbfb2f500f0ce8b3515ac313d496de57fbe89d0c6e0dd41fae6d7c2 -| HorizontalPodAutoscalerStatus : - ./types/io.k8s.api.autoscaling.v2beta2.HorizontalPodAutoscalerStatus.dhall sha256:505e3b01a2e3883b4dd0b5c6352fe3ee014b345b923558b22ac267e4ba55598b | MetricIdentifier : ./types/io.k8s.api.autoscaling.v2beta2.MetricIdentifier.dhall sha256:1fd0bd1aca4c86dd25a86802ed4bdf5bd13ff3c923ee8fe09ee3fe5037c5ff14 | MetricSpec : @@ -177,15 +177,15 @@ | JobStatus : ./types/io.k8s.api.batch.v1.JobStatus.dhall sha256:f9ea74adce4426e2277120d8427b62ca553e6a57274469139665a59801f8e1cd | CronJob : - ./types/io.k8s.api.batch.v2alpha1.CronJob.dhall sha256:1b69374e7d3b203f11737be704442167e0ea3de1f6a5390508416bb7fa74a6b2 + ./types/io.k8s.api.batch.v1beta1.CronJob.dhall sha256:1b69374e7d3b203f11737be704442167e0ea3de1f6a5390508416bb7fa74a6b2 | CronJobList : - ./types/io.k8s.api.batch.v2alpha1.CronJobList.dhall sha256:5e56f77f4bb3c3b6b7313b6bf78a2af4520e917d2e0c9685d90d0bce3543a213 + ./types/io.k8s.api.batch.v1beta1.CronJobList.dhall sha256:5e56f77f4bb3c3b6b7313b6bf78a2af4520e917d2e0c9685d90d0bce3543a213 | CronJobSpec : - ./types/io.k8s.api.batch.v2alpha1.CronJobSpec.dhall sha256:c51f71a4cdfa751236203b7c8b173636356b9b5b8b5a24d35196fea1b8f01218 + ./types/io.k8s.api.batch.v1beta1.CronJobSpec.dhall sha256:c51f71a4cdfa751236203b7c8b173636356b9b5b8b5a24d35196fea1b8f01218 | CronJobStatus : - ./types/io.k8s.api.batch.v2alpha1.CronJobStatus.dhall sha256:bde64bf966a728236e65593d21075a7f13c954793b7676d628b53594c2619b92 + ./types/io.k8s.api.batch.v1beta1.CronJobStatus.dhall sha256:bde64bf966a728236e65593d21075a7f13c954793b7676d628b53594c2619b92 | JobTemplateSpec : - ./types/io.k8s.api.batch.v2alpha1.JobTemplateSpec.dhall sha256:35df6b5c77f77cce9e11aeaebdb481499437c9d3aad6c57e4ad95232e17c41f6 + ./types/io.k8s.api.batch.v1beta1.JobTemplateSpec.dhall sha256:35df6b5c77f77cce9e11aeaebdb481499437c9d3aad6c57e4ad95232e17c41f6 | CertificateSigningRequest : ./types/io.k8s.api.certificates.v1beta1.CertificateSigningRequest.dhall sha256:90ca6e0524fbc7f112049b991c3f29c230b19545b4ed4a8574d43b68d66543ae | CertificateSigningRequestCondition :