From 59132b47b7c796eeeca576cb7ca6b96077b56be6 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Fri, 28 Aug 2020 07:44:06 -0700 Subject: [PATCH 1/3] Fix examples to use remote imports (#142) Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/140 --- 1.17/README.md | 39 +++++++++++++++++++++++++++++++++++++-- README.md | 4 ++-- docs/README.md.dhall | 35 +++++++++++++++++++++++++++++++++++ nix/dhall-haskell.json | 10 ++++------ nix/nixpkgs.nix | 2 +- 5 files changed, 79 insertions(+), 11 deletions(-) diff --git a/1.17/README.md b/1.17/README.md index bb7942e..0b848fb 100644 --- a/1.17/README.md +++ b/1.17/README.md @@ -53,7 +53,7 @@ In the following example, we: -- examples/deploymentSimple.dhall let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 let deployment = kubernetes.Deployment::{ @@ -148,7 +148,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 let Service = { name : Text, host : Text, version : Text } @@ -306,6 +306,41 @@ in ## Development +### Updating the `dhall-openapi` dependency + +The `dhall-openapi` dependency is a subproject of the `dhall-haskell` +repository, so in order to upgrade `dhall-openapi` you need to update the +reference to the `dhall-haskell` repository. + +To upgrade to the latest version of the `dhall-openapi` package, run: + +```bash +nix-prefetch-git --fetch-submodules https://github.com/dhall-lang/dhall-haskell.git > ./nix/dhall-haskell.json +``` + +If you want to build against a local copy of `dhall-haskell`, then edit the +Nix code like this: + +```diff +diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix +index 832ae1a..810e966 100644 +--- a/nix/nixpkgs.nix ++++ b/nix/nixpkgs.nix +@@ -126,11 +126,7 @@ let + json = + builtins.fromJSON (builtins.readFile ./dhall-haskell.json); + +- dhall-haskell = pkgsNew.fetchFromGitHub { +- owner = "dhall-lang"; +- repo = "dhall-haskell"; +- inherit (json) rev sha256 fetchSubmodules; +- }; ++ dhall-haskell = ~/path/to/dhall-haskell; + + in + (import "${dhall-haskell}/default.nix").dhall-openapi; +``` + ### Adding a new Kubernetes releases To add a new supported release, run: diff --git a/README.md b/README.md index ce3ee0d..0b848fb 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ In the following example, we: -- examples/deploymentSimple.dhall let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 let deployment = kubernetes.Deployment::{ @@ -148,7 +148,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 let Service = { name : Text, host : Text, version : Text } diff --git a/docs/README.md.dhall b/docs/README.md.dhall index b8a11e8..d3688e2 100644 --- a/docs/README.md.dhall +++ b/docs/README.md.dhall @@ -154,6 +154,41 @@ in ## Development +### Updating the `dhall-openapi` dependency + +The `dhall-openapi` dependency is a subproject of the `dhall-haskell` +repository, so in order to upgrade `dhall-openapi` you need to update the +reference to the `dhall-haskell` repository. + +To upgrade to the latest version of the `dhall-openapi` package, run: + +```bash +nix-prefetch-git --fetch-submodules https://github.com/dhall-lang/dhall-haskell.git > ./nix/dhall-haskell.json +``` + +If you want to build against a local copy of `dhall-haskell`, then edit the +Nix code like this: + +```diff +diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix +index 832ae1a..810e966 100644 +--- a/nix/nixpkgs.nix ++++ b/nix/nixpkgs.nix +@@ -126,11 +126,7 @@ let + json = + builtins.fromJSON (builtins.readFile ./dhall-haskell.json); + +- dhall-haskell = pkgsNew.fetchFromGitHub { +- owner = "dhall-lang"; +- repo = "dhall-haskell"; +- inherit (json) rev sha256 fetchSubmodules; +- }; ++ dhall-haskell = ~/path/to/dhall-haskell; + + in + (import "''${dhall-haskell}/default.nix").dhall-openapi; +``` + ### Adding a new Kubernetes releases To add a new supported release, run: diff --git a/nix/dhall-haskell.json b/nix/dhall-haskell.json index e4b9491..95ed6ad 100644 --- a/nix/dhall-haskell.json +++ b/nix/dhall-haskell.json @@ -1,9 +1,7 @@ { "url": "https://github.com/dhall-lang/dhall-haskell.git", - "rev": "05b12223f8d14055494d4c0cafc5db6807282c40", - "date": "2020-08-09T16:27:04+00:00", - "sha256": "0hgw2fq8n9v24pj3z6c28adwdmxffq5rxal12xk0vb7fvad46z42", - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false + "rev": "186cad7c7caf2d15c37bb5dcdac557535c648cc4", + "date": "2020-08-26T02:27:04+00:00", + "sha256": "0l5zr6di3k7934ayqd4rv3z8sjy55h2klvnqrd6k7adfk8ycnd97", + "fetchSubmodules": true } diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 832ae1a..e254bb1 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -108,7 +108,7 @@ let in pkgsNew.lib.optionalString (version == preferredVersion) ''echo './${inputFile} → ./${outputFile}' - ${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} > $out/${outputFile} + ${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} | ${pkgsNew.gnused}/bin/sed 's_\.\./package.dhall_https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall_g' > $out/${outputFile} '' } ''; From ad3369f9f9c375ba6b6a50312737c509f891871f Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Mon, 7 Sep 2020 21:30:28 -0700 Subject: [PATCH 2/3] Fix PersistentVolumeClaim (#144) Fixes https://github.com/dhall-lang/dhall-kubernetes/issues/136 --- 1.12/defaults.dhall | 4 ++-- 1.12/package.dhall | 6 +++--- 1.12/schemas.dhall | 10 +++++----- 1.12/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.12/typesUnion.dhall | 10 +++++----- 1.13/defaults.dhall | 4 ++-- 1.13/package.dhall | 6 +++--- 1.13/schemas.dhall | 10 +++++----- 1.13/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.13/typesUnion.dhall | 10 +++++----- 1.14/defaults.dhall | 4 ++-- 1.14/package.dhall | 6 +++--- 1.14/schemas.dhall | 10 +++++----- 1.14/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.14/typesUnion.dhall | 10 +++++----- 1.15/defaults.dhall | 4 ++-- 1.15/package.dhall | 6 +++--- 1.15/schemas.dhall | 10 +++++----- 1.15/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.15/typesUnion.dhall | 10 +++++----- 1.16/defaults.dhall | 4 ++-- 1.16/package.dhall | 6 +++--- 1.16/schemas.dhall | 10 +++++----- 1.16/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.16/typesUnion.dhall | 10 +++++----- 1.17/README.md | 4 ++-- 1.17/defaults.dhall | 4 ++-- 1.17/examples/aws-iam-authenticator-chart.dhall | 2 +- 1.17/examples/deployment.dhall | 2 +- 1.17/examples/deploymentSimple.dhall | 2 +- 1.17/examples/ingress.dhall | 2 +- 1.17/examples/service.dhall | 2 +- 1.17/package.dhall | 6 +++--- 1.17/schemas.dhall | 10 +++++----- 1.17/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.17/typesUnion.dhall | 10 +++++----- 1.18/defaults.dhall | 4 ++-- 1.18/package.dhall | 6 +++--- 1.18/schemas.dhall | 10 +++++----- 1.18/types.dhall | 10 +++++----- .../io.k8s.api.core.v1.PersistentVolumeClaim.dhall | 6 +++--- 1.18/typesUnion.dhall | 10 +++++----- README.md | 4 ++-- examples/aws-iam-authenticator-chart.dhall | 2 +- examples/deployment.dhall | 2 +- examples/deploymentSimple.dhall | 2 +- examples/ingress.dhall | 2 +- examples/service.dhall | 2 +- nix/dhall-haskell.json | 6 +++--- 55 files changed, 178 insertions(+), 178 deletions(-) diff --git a/1.12/defaults.dhall b/1.12/defaults.dhall index 76a6a92..b925f0e 100644 --- a/1.12/defaults.dhall +++ b/1.12/defaults.dhall @@ -63,13 +63,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:c2fefb2c111a4d5fd9a15b687e34acfe902d9a1a2b26c590c6fba06a88be19d1 + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1cd2a37ff9e72803b67f266ef0a0074eb7a060fe7f332a6079d0b3234e28fd49 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:b5d6dae10931a9bed3a7acadbd5c516de6ee94ef8ca0dc8f81bdee24c2c486ea + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:72862d850c71b6507abb771da4fe2b2178c02c21e8b75c12a069abebcead203d , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.12/package.dhall b/1.12/package.dhall index e55ddcf..0420d6e 100644 --- a/1.12/package.dhall +++ b/1.12/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:900cba20625073437fa7ef5838f88ddc21076e7be6c7dab317f5afe6821a40d3 + ./schemas.dhall sha256:a594dda45e47e6f5e973efaac88bfc68b671320ee75156ed9f9b3ae9e2306a58 ∧ { IntOrString = - ( ./types.dhall sha256:4e1f82454768ae7ce7b0f3978d32fd2a87902ae374132bfd44a70f901dad5286 + ( ./types.dhall sha256:c34104edfd0afd6c335cb607bfaa521667c48be98251f07c7ba38b99339ea66f ).IntOrString , Resource = - ./typesUnion.dhall sha256:ed77bc9738486b05b9c2528b17ae137d21c07ffc7665af2d6fdd2d28a34c0e86 + ./typesUnion.dhall sha256:25d6f0527f9d83663af22313a61f7c4a3a8a6451a0a61855a7c377a3cc86fb1e } diff --git a/1.12/schemas.dhall b/1.12/schemas.dhall index b11180f..09dc540 100644 --- a/1.12/schemas.dhall +++ b/1.12/schemas.dhall @@ -63,13 +63,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:debfcdc32ab934c4ec7e7f9325800053e84dc810e4a336d1c2bd772ff3299117 + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:406e2db1218cb2ce1a4c377bdea5b631cab339d781c237bce00e7d82e99fb490 , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8ba6677560a59a4020c1370427e8953e703c289e61802f65aedf627601170c3d + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:9817c299e8b7ad0ab082a4db7394b81d5d86b436e40b928224a757a928b580fd , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:9fa5b9ce8e256b8745161dd8c62eb85adf486925d91ea34f6ffd89ccde4d8d82 + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:7402548114c9f12c39bc8c2a2d6a3e32c76bbd75e0a67814c549e952a2b9218f , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -381,11 +381,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:771c0d9eecb0dafabc08a8a8e1bab69e93f3ca0aa98939bda32c4260b3eaefee , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:2747acf15c986057e3b7319af0c6286c6a3216970726edc706d5b8e4664f8fab + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:e24c6c09efecdf6d8d1dbfd2f92405d4ed46af26eabd9355c598fb122c6bc7e9 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:7555693821fa1ecc7a175e81a3842916e2e33b039fd6e71dee3a295d2a70b615 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c5b6aa35559ccf80f08f3eae586bda4c7d2c05df7b988ed21352b041a2956aa9 , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.12/types.dhall b/1.12/types.dhall index 85ad1ae..6513f80 100644 --- a/1.12/types.dhall +++ b/1.12/types.dhall @@ -63,13 +63,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d83030bed394089a30854923d2a8b3a9a9f7008df279cecd25695cdc3cc7a8e2 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:f292a854900f03def4081485bd3503cf836a68c15b843b5adbd16fcfd36ddc84 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:3792339fa089fbf1e7cf8c8b449aa4a73f952d411b7ed56f129158911736802f + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:979a936c0e884a731fd79e024d6ccea724d88784e102917c41b5c643c75c8a51 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:115feab8c35dcb6daca2e7e12d889279a30f9094707f35b5fc36e92641a8b14a + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:77b0937e89668ef16ede26c456a6695fe1a100dccb67ea2c2206761b8fd72ee4 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -381,11 +381,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5d5b6247c5280b78bf83b8e107a4606b90aed106989305e43461f637a09e1b0c , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:d24f5d4601e227b6ef32a14d20bf9ce5737ca23a63d9988c638f2c62944e27bd + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:f803ca3ef1c632da8743a80c4ccf689a68c06faa3fe2633895cf5f9a068987ab , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:56cbd57f92b1399c6512adebbe26cfa5838b608d043e97803e59a81d6596c609 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c7f3bd5d9437b3d9b7e07e4a312a481d75cb1b95573e6045bdffc69cf54a9cf2 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.12/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.12/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.12/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.12/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.12/typesUnion.dhall b/1.12/typesUnion.dhall index 9816837..5c459be 100644 --- a/1.12/typesUnion.dhall +++ b/1.12/typesUnion.dhall @@ -63,13 +63,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d83030bed394089a30854923d2a8b3a9a9f7008df279cecd25695cdc3cc7a8e2 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:f292a854900f03def4081485bd3503cf836a68c15b843b5adbd16fcfd36ddc84 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:3792339fa089fbf1e7cf8c8b449aa4a73f952d411b7ed56f129158911736802f + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:979a936c0e884a731fd79e024d6ccea724d88784e102917c41b5c643c75c8a51 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:115feab8c35dcb6daca2e7e12d889279a30f9094707f35b5fc36e92641a8b14a + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:77b0937e89668ef16ede26c456a6695fe1a100dccb67ea2c2206761b8fd72ee4 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -381,11 +381,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5d5b6247c5280b78bf83b8e107a4606b90aed106989305e43461f637a09e1b0c | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:d24f5d4601e227b6ef32a14d20bf9ce5737ca23a63d9988c638f2c62944e27bd + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:f803ca3ef1c632da8743a80c4ccf689a68c06faa3fe2633895cf5f9a068987ab | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:56cbd57f92b1399c6512adebbe26cfa5838b608d043e97803e59a81d6596c609 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c7f3bd5d9437b3d9b7e07e4a312a481d75cb1b95573e6045bdffc69cf54a9cf2 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.13/defaults.dhall b/1.13/defaults.dhall index c1b87ba..3529644 100644 --- a/1.13/defaults.dhall +++ b/1.13/defaults.dhall @@ -61,13 +61,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:2be422cc24ac1164945d98f4c0b2c104580f829e035aebf932434181ce023299 + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:eb4db7ba9a51c6a246cdf9bca1fdf6f240a5d5e9f7d8c452657d296a7bed2e1b , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:b5d6dae10931a9bed3a7acadbd5c516de6ee94ef8ca0dc8f81bdee24c2c486ea + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:72862d850c71b6507abb771da4fe2b2178c02c21e8b75c12a069abebcead203d , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.13/package.dhall b/1.13/package.dhall index 68d6fbd..cdbd048 100644 --- a/1.13/package.dhall +++ b/1.13/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:b978e3b6cc25768bb401f293412b6efb4c2897277800029392d5326dc69e9495 + ./schemas.dhall sha256:c64ad71d97837dec9927bbcf6daed9985b401c98faff596fc480462d8f6bfb85 ∧ { IntOrString = - ( ./types.dhall sha256:d95aa23735a60a8a3a6b3e89fdefa24904ba5ded748c069facafa1e87c8d8bfc + ( ./types.dhall sha256:29c592c05af44a06ae19915bb14ab8b1965b5e63b93e84aea6d2a9e9d44da99d ).IntOrString , Resource = - ./typesUnion.dhall sha256:3ce20a883a2de1c73dddab8496b096201d4d954f6809b580b5420fadc6f6275a + ./typesUnion.dhall sha256:6774bfec1d12d0e61ab18b609820e5a352e7500d95d59d971096241a197001dc } diff --git a/1.13/schemas.dhall b/1.13/schemas.dhall index db29b17..d05ca28 100644 --- a/1.13/schemas.dhall +++ b/1.13/schemas.dhall @@ -61,13 +61,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6621e0b47742c1f2570f5ab17ff3525ea98c7a4b398dd49cfe29b93fa3c86c99 + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:aa34886223bed983a487af942f1db0b87327d3ee51a78f7da9b3d0ffa9db7f2f , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:e359df2f8f18ffe0b66ee5141f8a7a2aa6e06870964178e5aa29bbbea9b1d007 + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:9c9b5e00126780df8f224ae507658afea3701cd3a0b20dd419ebc263903dfef6 , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:f38a3f6c7c57f682975358db9e72227c9c30814cd62a1a2b05bccb06ddf08247 + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:08d011ad58e9a360edbb3bea621cdb5481a916823140c41b804419809a571fd7 , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -391,11 +391,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:8dd8b69d75e92f80a672a2cea9767ffc4f4d1b4c0fe7a72e5c9d54825048aeba , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:2747acf15c986057e3b7319af0c6286c6a3216970726edc706d5b8e4664f8fab + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:e24c6c09efecdf6d8d1dbfd2f92405d4ed46af26eabd9355c598fb122c6bc7e9 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:7555693821fa1ecc7a175e81a3842916e2e33b039fd6e71dee3a295d2a70b615 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c5b6aa35559ccf80f08f3eae586bda4c7d2c05df7b988ed21352b041a2956aa9 , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.13/types.dhall b/1.13/types.dhall index e8b80bc..8841332 100644 --- a/1.13/types.dhall +++ b/1.13/types.dhall @@ -61,13 +61,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:2d11eeebec4a8ff19d893df3f1d15f99212e5bc0ac3377d7258f0b71a8ee0e2f + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:b8f48b319a9301b608402adaa25eeeb66efb4f2ae7183e7acad018d2f1d7b026 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:5937b3d85b4656fc3ebb9c45006ca6941b51af1a0b7ccf22efaa6619d250bcdb + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:7786a8802dece0ffd74f0286041683cdd0979f382b20bcb3f359a25408595c93 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:80fd973388f284e2196280cc39c9034f9b11653075bd2a3256169e5e5c21bc38 + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:4c654f94aa484742d641b8a801efae1482368080925080f20f2245c845e1cde9 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -391,11 +391,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:ac751966420d9041528c6efefe303c1318b3f4dfa39c0807c5f59767285ec60c , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:d24f5d4601e227b6ef32a14d20bf9ce5737ca23a63d9988c638f2c62944e27bd + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:f803ca3ef1c632da8743a80c4ccf689a68c06faa3fe2633895cf5f9a068987ab , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:56cbd57f92b1399c6512adebbe26cfa5838b608d043e97803e59a81d6596c609 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c7f3bd5d9437b3d9b7e07e4a312a481d75cb1b95573e6045bdffc69cf54a9cf2 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.13/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.13/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.13/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.13/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.13/typesUnion.dhall b/1.13/typesUnion.dhall index d562da6..5723f53 100644 --- a/1.13/typesUnion.dhall +++ b/1.13/typesUnion.dhall @@ -61,13 +61,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:2d11eeebec4a8ff19d893df3f1d15f99212e5bc0ac3377d7258f0b71a8ee0e2f + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:b8f48b319a9301b608402adaa25eeeb66efb4f2ae7183e7acad018d2f1d7b026 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:5937b3d85b4656fc3ebb9c45006ca6941b51af1a0b7ccf22efaa6619d250bcdb + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:7786a8802dece0ffd74f0286041683cdd0979f382b20bcb3f359a25408595c93 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:80fd973388f284e2196280cc39c9034f9b11653075bd2a3256169e5e5c21bc38 + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:4c654f94aa484742d641b8a801efae1482368080925080f20f2245c845e1cde9 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -391,11 +391,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:ac751966420d9041528c6efefe303c1318b3f4dfa39c0807c5f59767285ec60c | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:d24f5d4601e227b6ef32a14d20bf9ce5737ca23a63d9988c638f2c62944e27bd + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:f803ca3ef1c632da8743a80c4ccf689a68c06faa3fe2633895cf5f9a068987ab | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:56cbd57f92b1399c6512adebbe26cfa5838b608d043e97803e59a81d6596c609 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:c7f3bd5d9437b3d9b7e07e4a312a481d75cb1b95573e6045bdffc69cf54a9cf2 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.14/defaults.dhall b/1.14/defaults.dhall index d72b1d1..838f8b6 100644 --- a/1.14/defaults.dhall +++ b/1.14/defaults.dhall @@ -55,13 +55,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:5c61d3606340f75fca1b5d386be8b9e07a178730b62725c786651d34cf288f26 + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:9983a7c1092367a2e0ba482e6e7c08b6572794a835e1d3812529e76842130206 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:f1ad1ff48db14f593ece388e2d064e505e4d6f721ed8f72f85678bf6cd233960 + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:8cc04488f12b9c14dba5e88aec7e8a7f0c5ddee49ce1405dfa995e64b88d286e , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.14/package.dhall b/1.14/package.dhall index addbcb9..54925e7 100644 --- a/1.14/package.dhall +++ b/1.14/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:7369258e8911c978085568de68acc6b388954ab038f7b04e3ff272aa4d10f721 + ./schemas.dhall sha256:872705eee2b92df25aceffc644570e755e2af1e4c2aabec3ca961b07c86fc28b ∧ { IntOrString = - ( ./types.dhall sha256:9d5fd33778a18beb9287c5f0b469c419af8a0883a687c54b4f86e3cc79eeaae5 + ( ./types.dhall sha256:5900683b6f4275e9ce5b0815b3cacb1a6dae32cf234973a6bffc5ebc65f25f0d ).IntOrString , Resource = - ./typesUnion.dhall sha256:cd0cb6c8fcf4d75ef272135a29243fd6c873a2fc85ef224817be2697d00617c7 + ./typesUnion.dhall sha256:98c5b6e26e694721cc287366821715b85efaa74d28ec75f1a7d8745ff36f9a4f } diff --git a/1.14/schemas.dhall b/1.14/schemas.dhall index 74829c3..f6f4788 100644 --- a/1.14/schemas.dhall +++ b/1.14/schemas.dhall @@ -55,13 +55,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:ccf858b818ad19f21cdbfbcbff6022cfc6a52dc6c04fdfe90236c5fe5edb27ff + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:0f51370206cdaf1534f7a2be8a2ea57c8e8417c3798552ba1cb0b612207080e0 , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:2049aa7ffb9a511cccf099bfddb2d5a1ba3e0e858a51c6773287c1b880ec68e0 + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:6dd11f95d8398fae44dddc6e49f754745991db88305db72bb344f05b22702faf , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:e226e3a69db711a023c5e368a258739393873c9f929b90eaa58a3c6da5a63eca + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:3974b48165780984ff5446b8b8cdb582c6b14919483376eb0c6d6aa0a652544a , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -387,11 +387,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:e637539debd5d80de6afe27cc92f0262e69d117e57b3af04d6d795bd4982ee96 , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8595be804b5c09e4ef4fd8359d59b31d93e2676bd5af64168a7ea90ea1e72c63 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:1c33d02722ba6b2cf1f7a50a8a22475cafd0a76746409f8d49fc6e887ed82624 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:e9e35d1c6f416b79c07c071a45e656c84a3e5c9af7fb7c7b90ac688ba86bc21b + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:e461455b2e292c3e513f1846af4072adcfcfd7d273834405be4c9e699d7ad74d , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.14/types.dhall b/1.14/types.dhall index 8266fc7..edfaeb4 100644 --- a/1.14/types.dhall +++ b/1.14/types.dhall @@ -55,13 +55,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:bc46779c39467550af40b53c2d2366d743c5d4e27e36041a85042c6f4aa6bc32 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d07a6dad303e8e195d6760c06d59a9b0c0f27f83394d12a4243d8b49969ddd2b , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:e3ae629ac664912849fbf6ed9d1cf1173d4c1c1a93fabd886e52adfdec4db718 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:7113a1890784062ea3b508e8dfdd4fb26c0c762091b42ee411252ba3e5f23baa , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:b408c4c2d6f30abc801b9a5936873bb1c035bc782d2ecd0de55ab2020d891c67 + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:6c86955b71859bdef84e0d7b4367c7d2cff0cec80ee8cb8801ac7f00c79f116c , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -387,11 +387,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:7d83dad6eca23bc4257c46a179135122b7178e8881ecb568c84a01c0fb72b0ca , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:e4e9103570cbeb0b862641377aefead53f80522c02bf3757b412f84c82609855 + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:5de06f182e20377fc543f893eb8fa43f231804ab0b4c2b45be2d386c85102e73 , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:69729f663de3ac18706989fe1b46ae539a0508c56ff6fe9a364ae776333aed4d + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:4f4720d5ba6eefdd8902e0df4922e0ddad20ea7b15887d15b82ecf85777fe525 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.14/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.14/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.14/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.14/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.14/typesUnion.dhall b/1.14/typesUnion.dhall index e8030fa..d1923bf 100644 --- a/1.14/typesUnion.dhall +++ b/1.14/typesUnion.dhall @@ -55,13 +55,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:bc46779c39467550af40b53c2d2366d743c5d4e27e36041a85042c6f4aa6bc32 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d07a6dad303e8e195d6760c06d59a9b0c0f27f83394d12a4243d8b49969ddd2b | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:e3ae629ac664912849fbf6ed9d1cf1173d4c1c1a93fabd886e52adfdec4db718 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:7113a1890784062ea3b508e8dfdd4fb26c0c762091b42ee411252ba3e5f23baa | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:b408c4c2d6f30abc801b9a5936873bb1c035bc782d2ecd0de55ab2020d891c67 + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:6c86955b71859bdef84e0d7b4367c7d2cff0cec80ee8cb8801ac7f00c79f116c | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -387,11 +387,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:7d83dad6eca23bc4257c46a179135122b7178e8881ecb568c84a01c0fb72b0ca | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:e4e9103570cbeb0b862641377aefead53f80522c02bf3757b412f84c82609855 + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:5de06f182e20377fc543f893eb8fa43f231804ab0b4c2b45be2d386c85102e73 | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:69729f663de3ac18706989fe1b46ae539a0508c56ff6fe9a364ae776333aed4d + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:4f4720d5ba6eefdd8902e0df4922e0ddad20ea7b15887d15b82ecf85777fe525 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.15/defaults.dhall b/1.15/defaults.dhall index 37dd725..cc0cd85 100644 --- a/1.15/defaults.dhall +++ b/1.15/defaults.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:5507f174f6e9b8dfd93709e55543f27c6493085e1d11722cff15dcaba49ead49 + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:8bf887040117ba9badf88e1bf19937b91b2ea01cc37304705ee361d0f935b299 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:dd48839be98010948af903a89f462f003b4095d2ca85dccf8c58a401ee1fd88a + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:22ae573e896e7c9d4b9f8192b18002784d0a3e06480c58e3203dd86df2a5d762 , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.15/package.dhall b/1.15/package.dhall index ca0bb11..dd5d970 100644 --- a/1.15/package.dhall +++ b/1.15/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:f8b6c561978befe20ef0221c4357c8872de9e0fc5a9e8b5c300cee909cffcc00 + ./schemas.dhall sha256:f597b165f4581f68399fa1b085c16841a491fb49bd36cef0d5421525e5f0ec54 ∧ { IntOrString = - ( ./types.dhall sha256:50d664b31011f4fb2276977ca63a77b6223ac15592877563f04db2a24899d539 + ( ./types.dhall sha256:b1d4ee60fa7cabcc22bef1c2ac730e0343583659d70b2d57a490a121a2360253 ).IntOrString , Resource = - ./typesUnion.dhall sha256:5d54195a8abaf9bd50ed86176ad6e6278f14f2765ea67116e01f63df8faafc6c + ./typesUnion.dhall sha256:dc2469876e467ce175af02b1a9a7ef9948a82bece1e83216d8ab9a33b80f8da2 } diff --git a/1.15/schemas.dhall b/1.15/schemas.dhall index 7dcaa21..ba0d9f8 100644 --- a/1.15/schemas.dhall +++ b/1.15/schemas.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:aa328af15276ee1c580b4d45538e24be17f927a9fdf83fb5f6d5e012b6f9a4d0 + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:9e5643b5d7239dfde09ae0f3382ab3771106d3406dba03f01f41e15259a4e6e7 , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:7b7e19a263711be60d8fcd2fe753d94a26551d68d2a6f8f9aa1f4d8e0fc27cb8 + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:cb9f8a40ed28a86785935b2117df0defe5699401d9c4725851b070565214544d , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:9e7831adfead1edd7fe3373cf33031ecf7a2259d5cd01fc33b2f78879281276c + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:a22459f551e2953925bdc25e5b6a30917429a01479f9ecd6d9b5680f252a6e06 , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -391,11 +391,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:08259faa56ec37881e3a86b2b103d9a1edf20c724dcda07eead46a52b98d37e9 , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:fe9c77c8ac2580d8373f76b60c39cb6734a1bfffdbcc0336edfd9e021e87a65d + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:e54264416b22c380366d33cec378d5e69031fb7328df17728781f1d4155a4c89 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:5c9c20233434b0232914f575e07e42e2d5282d4432adf6ca444de262af0471db + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:5dea1c3c340ede0253e1b23bef1f913affa06445c39f1b03a6bdb38dc588985b , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.15/types.dhall b/1.15/types.dhall index 3555a88..c0e9354 100644 --- a/1.15/types.dhall +++ b/1.15/types.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:4c655733184d0500ac8e4e820073481edc16a703ab1fe15dc835a18ea846db12 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:57cbb0c97b06fb28416fd57f93bf794c6f020b0099680f6e049e67cabbc206d1 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8961587f9e4864af4ab01c18a05e1f10a30e356016537e734b8355890b2f6419 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:24fe648b8bc30a0e34481ec0360c35cbd7fd66d5ab9e253112f03fc6e5bc83e9 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:80f0a19209e0d7d5cd3eebdd8652ce5e66f77ef1d3c8bc4311c3de0b195e274d + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:29d6549c199bf48bfb77b50a9a54545a404361d981c7aa0422ffabe31818d828 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -391,11 +391,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:094a315626ba16d28d0fda7ba88aace781cdd16fae81aa09cee1653ed9d0385f , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:41041d96892ddb6f6906c778e2dfd090c2920ad4f467a4981b2a5ade7b8358f4 + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:83fe01027c7540bf700a16fbfcd66d25fad6787d3a70e98d094a2529fec55536 , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:7c6e0ae399a8de98b353009ff94f2c0429917d18ec0859fcea2e6b12d89a0ccd + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:3fecdd76e8fa052ab608b7d55819d9772a736c37167e559a3e689190520e82f9 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.15/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.15/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.15/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.15/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.15/typesUnion.dhall b/1.15/typesUnion.dhall index f0803b5..3fc045b 100644 --- a/1.15/typesUnion.dhall +++ b/1.15/typesUnion.dhall @@ -57,13 +57,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:4c655733184d0500ac8e4e820073481edc16a703ab1fe15dc835a18ea846db12 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:57cbb0c97b06fb28416fd57f93bf794c6f020b0099680f6e049e67cabbc206d1 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8961587f9e4864af4ab01c18a05e1f10a30e356016537e734b8355890b2f6419 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:24fe648b8bc30a0e34481ec0360c35cbd7fd66d5ab9e253112f03fc6e5bc83e9 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:80f0a19209e0d7d5cd3eebdd8652ce5e66f77ef1d3c8bc4311c3de0b195e274d + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:29d6549c199bf48bfb77b50a9a54545a404361d981c7aa0422ffabe31818d828 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -391,11 +391,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:094a315626ba16d28d0fda7ba88aace781cdd16fae81aa09cee1653ed9d0385f | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:41041d96892ddb6f6906c778e2dfd090c2920ad4f467a4981b2a5ade7b8358f4 + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:83fe01027c7540bf700a16fbfcd66d25fad6787d3a70e98d094a2529fec55536 | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:7c6e0ae399a8de98b353009ff94f2c0429917d18ec0859fcea2e6b12d89a0ccd + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:3fecdd76e8fa052ab608b7d55819d9772a736c37167e559a3e689190520e82f9 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.16/defaults.dhall b/1.16/defaults.dhall index f1d9bf0..5f40d64 100644 --- a/1.16/defaults.dhall +++ b/1.16/defaults.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:2c6bf10f3894b690de2d41a35d4e5d07041b6f6849e8b8cc7e2c16705aaf4bca + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:32c92803bcb882be48429e70d50d97069511c270dfc05c516cefce426546fe37 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:080b76b5d98d904c3be09076e102b4bc60febdfe4a2a172877deeb4709acc088 + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:030dafb5dc9cf002817a852901f9587664f7a28b633202333832a37b7bdf1925 , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.16/package.dhall b/1.16/package.dhall index 32bd78e..144451b 100644 --- a/1.16/package.dhall +++ b/1.16/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:65658547c350db048eb8793c2d16fd3e330cf33ddd8d3de0d168d8f2dd5d2057 + ./schemas.dhall sha256:5d06aca5fb0cd7f5f663a54688e4f3bb087f9d3ce6a0137b7a9bd7c086f476d0 ∧ { IntOrString = - ( ./types.dhall sha256:bc9347c697d9bd169fc769600f68ce3e64e9575143a51ea278970c2793d3a47a + ( ./types.dhall sha256:8df69a27a548a702719b2b91b28db2b1395fa744a1afa55f76d4a85312b5c3a1 ).IntOrString , Resource = - ./typesUnion.dhall sha256:5148721a3b8fe9a96c57a8bafba9e002deea7babf40d686fe0274310222d5ef4 + ./typesUnion.dhall sha256:56e87d9078fcdba6430a42b3d153552a644cc520b0544b45598babb500ed90a9 } diff --git a/1.16/schemas.dhall b/1.16/schemas.dhall index 4497f48..7fc041d 100644 --- a/1.16/schemas.dhall +++ b/1.16/schemas.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6e4fc25ed2edf9aba2b3697ec6be9d805e772858c1ae0715972dc1a2fb960d3e + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:5e736bc483603e0fead8bf45af53c680555c619c61e9817b3ab8e50c371c4e1a , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:53ea4522684820149771628266aaa640321c142142f5177f17d26f7dd2497900 + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:97b9460b37a14cbc39deb917d1e83e9944861784e51453496ff17646cb8acadc , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:35de944e7211abb1c6e36897edb38a7aa7097c7a4809eb23dde44732c5f8ac85 + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:ef36289d738b94a68d13fd7be8a7334fd5b6244af92e42d81565bfdd7e1ac56b , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -403,11 +403,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:07ee3c061a27d126dad0bdae853da77f6f3f18e7e7a72a5eaea9e7b8663500ad , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:77bb81693df32d1ef5ea83aad4c5bc36ada88fdc9aef29abb6f71348967ca868 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:81005f0b9a9aab7008deb08e4615b8af233dcca25aa0e894f30eeb0430c4d406 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:fcd640a855d397128a0bf4637e7425529a12a8e15ea3138e8ac8975bef904218 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:31ee43cbecd4860fbf7d03c6d65fc049d26a5db6d40ac527b9bafbacbf7d4e4d , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.16/types.dhall b/1.16/types.dhall index 3a70122..1150065 100644 --- a/1.16/types.dhall +++ b/1.16/types.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1099bc01f76db0f110e10c929c7c6fe93652fd29e2964e573620fbcc4587b327 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6ffeb8022959eadf48afe0da1095d9ab2844f740937898eed4486308331b6b13 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:4890c762c085174e8b8925fb4ad00418947ec0e81728ec3b6506258f4f0d9d37 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:ce8f44a55a45992e315cfc978c1196ab121d3b61c91f9000402b7a896a43b249 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:798c7225b11a973523a7e771e3389b452389bd8c24af84533ced50b717ae1daf + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:d4a6c6ad0c1ac7bf9fbc2c51b9fb92fcfef170ce9b9e4477c32ef66f85bc7406 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -403,11 +403,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.16/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.16/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.16/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.16/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.16/typesUnion.dhall b/1.16/typesUnion.dhall index 9424792..4b0dd66 100644 --- a/1.16/typesUnion.dhall +++ b/1.16/typesUnion.dhall @@ -57,13 +57,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1099bc01f76db0f110e10c929c7c6fe93652fd29e2964e573620fbcc4587b327 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6ffeb8022959eadf48afe0da1095d9ab2844f740937898eed4486308331b6b13 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:4890c762c085174e8b8925fb4ad00418947ec0e81728ec3b6506258f4f0d9d37 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:ce8f44a55a45992e315cfc978c1196ab121d3b61c91f9000402b7a896a43b249 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:798c7225b11a973523a7e771e3389b452389bd8c24af84533ced50b717ae1daf + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:d4a6c6ad0c1ac7bf9fbc2c51b9fb92fcfef170ce9b9e4477c32ef66f85bc7406 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -403,11 +403,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.17/README.md b/1.17/README.md index 0b848fb..f8ea141 100644 --- a/1.17/README.md +++ b/1.17/README.md @@ -53,7 +53,7 @@ In the following example, we: -- examples/deploymentSimple.dhall let kubernetes = - https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ @@ -148,7 +148,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let Service = { name : Text, host : Text, version : Text } diff --git a/1.17/defaults.dhall b/1.17/defaults.dhall index 11b5e0b..32054a6 100644 --- a/1.17/defaults.dhall +++ b/1.17/defaults.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:2c6bf10f3894b690de2d41a35d4e5d07041b6f6849e8b8cc7e2c16705aaf4bca + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:32c92803bcb882be48429e70d50d97069511c270dfc05c516cefce426546fe37 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:080b76b5d98d904c3be09076e102b4bc60febdfe4a2a172877deeb4709acc088 + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:030dafb5dc9cf002817a852901f9587664f7a28b633202333832a37b7bdf1925 , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.17/examples/aws-iam-authenticator-chart.dhall b/1.17/examples/aws-iam-authenticator-chart.dhall index 5cf6ec0..753959b 100644 --- a/1.17/examples/aws-iam-authenticator-chart.dhall +++ b/1.17/examples/aws-iam-authenticator-chart.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let release = "wintering-rodent" diff --git a/1.17/examples/deployment.dhall b/1.17/examples/deployment.dhall index f47f799..54a1397 100644 --- a/1.17/examples/deployment.dhall +++ b/1.17/examples/deployment.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ diff --git a/1.17/examples/deploymentSimple.dhall b/1.17/examples/deploymentSimple.dhall index 528ead9..aed387f 100644 --- a/1.17/examples/deploymentSimple.dhall +++ b/1.17/examples/deploymentSimple.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ diff --git a/1.17/examples/ingress.dhall b/1.17/examples/ingress.dhall index 2dffa60..975b583 100644 --- a/1.17/examples/ingress.dhall +++ b/1.17/examples/ingress.dhall @@ -4,7 +4,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let Service = { name : Text, host : Text, version : Text } diff --git a/1.17/examples/service.dhall b/1.17/examples/service.dhall index a743470..71c4dbb 100644 --- a/1.17/examples/service.dhall +++ b/1.17/examples/service.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let spec = { selector = Some (toMap { app = "nginx" }) diff --git a/1.17/package.dhall b/1.17/package.dhall index f39627d..6b2eb0e 100644 --- a/1.17/package.dhall +++ b/1.17/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:2234b9ff33ff2b9cff3e828bbf465dc7d5515e333c6bcc1a3e960fffcd239dd3 + ./schemas.dhall sha256:f282ec56c0de2fb9b7a06c8a41d36f34f5d79ea54bbdc3ec2d87f0e14cfc4246 ∧ { IntOrString = - ( ./types.dhall sha256:e16b14585f9e7f1ff02e35e5469d93e31caaa74b94373b7795f72e7799a17dd8 + ( ./types.dhall sha256:2b2ff76dda44fec4b227fa1a9d4eec83a6c532a3685f39636404f0d36b32bc90 ).IntOrString , Resource = - ./typesUnion.dhall sha256:7cfce6d27d8cbf87986ed23a48a755deb18f092218806bfbdd73a8f36845e708 + ./typesUnion.dhall sha256:d7b8c9c574f3c894fa2bca9d9c2bec1fea972bb3acdde90e473bc2d6ee51b5b1 } diff --git a/1.17/schemas.dhall b/1.17/schemas.dhall index 6ec6bda..93b57e8 100644 --- a/1.17/schemas.dhall +++ b/1.17/schemas.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6e4fc25ed2edf9aba2b3697ec6be9d805e772858c1ae0715972dc1a2fb960d3e + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:5e736bc483603e0fead8bf45af53c680555c619c61e9817b3ab8e50c371c4e1a , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:53ea4522684820149771628266aaa640321c142142f5177f17d26f7dd2497900 + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:97b9460b37a14cbc39deb917d1e83e9944861784e51453496ff17646cb8acadc , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:35de944e7211abb1c6e36897edb38a7aa7097c7a4809eb23dde44732c5f8ac85 + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:ef36289d738b94a68d13fd7be8a7334fd5b6244af92e42d81565bfdd7e1ac56b , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -403,11 +403,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:07ee3c061a27d126dad0bdae853da77f6f3f18e7e7a72a5eaea9e7b8663500ad , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:77bb81693df32d1ef5ea83aad4c5bc36ada88fdc9aef29abb6f71348967ca868 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:81005f0b9a9aab7008deb08e4615b8af233dcca25aa0e894f30eeb0430c4d406 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:fcd640a855d397128a0bf4637e7425529a12a8e15ea3138e8ac8975bef904218 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:31ee43cbecd4860fbf7d03c6d65fc049d26a5db6d40ac527b9bafbacbf7d4e4d , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.17/types.dhall b/1.17/types.dhall index eb34527..7f9309d 100644 --- a/1.17/types.dhall +++ b/1.17/types.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1099bc01f76db0f110e10c929c7c6fe93652fd29e2964e573620fbcc4587b327 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6ffeb8022959eadf48afe0da1095d9ab2844f740937898eed4486308331b6b13 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:4890c762c085174e8b8925fb4ad00418947ec0e81728ec3b6506258f4f0d9d37 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:ce8f44a55a45992e315cfc978c1196ab121d3b61c91f9000402b7a896a43b249 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:798c7225b11a973523a7e771e3389b452389bd8c24af84533ced50b717ae1daf + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:d4a6c6ad0c1ac7bf9fbc2c51b9fb92fcfef170ce9b9e4477c32ef66f85bc7406 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -403,11 +403,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.17/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.17/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.17/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.17/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.17/typesUnion.dhall b/1.17/typesUnion.dhall index df32fc5..e0f739f 100644 --- a/1.17/typesUnion.dhall +++ b/1.17/typesUnion.dhall @@ -57,13 +57,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1099bc01f76db0f110e10c929c7c6fe93652fd29e2964e573620fbcc4587b327 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:6ffeb8022959eadf48afe0da1095d9ab2844f740937898eed4486308331b6b13 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:4890c762c085174e8b8925fb4ad00418947ec0e81728ec3b6506258f4f0d9d37 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:ce8f44a55a45992e315cfc978c1196ab121d3b61c91f9000402b7a896a43b249 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:798c7225b11a973523a7e771e3389b452389bd8c24af84533ced50b717ae1daf + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:d4a6c6ad0c1ac7bf9fbc2c51b9fb92fcfef170ce9b9e4477c32ef66f85bc7406 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -403,11 +403,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/1.18/defaults.dhall b/1.18/defaults.dhall index b2cbe1a..aab345e 100644 --- a/1.18/defaults.dhall +++ b/1.18/defaults.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./defaults/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:4d9feb8034f9f58692aebeed06474c07c387e5b8bc11c40dc36ec6390a26fa63 , StatefulSet = - ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:7dfe97a524a4834ba054c4c311ecd97f7534c677f431dbbe5c00096b06241e3b + ./defaults/io.k8s.api.apps.v1.StatefulSet.dhall sha256:96396873908a88024331a0ef8c72bbee018a7537fc7474310e5665aec1f6f737 , StatefulSetCondition = ./defaults/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:fef63958bc998f900417bd68974df7936535249af83edf1183721637fa3e7257 , StatefulSetList = ./defaults/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:8d569b37c7ccea14e75e2f6a3b0424afb4a35e4f2058b4c2dfe6cc0f3457d525 , StatefulSetSpec = - ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:080b76b5d98d904c3be09076e102b4bc60febdfe4a2a172877deeb4709acc088 + ./defaults/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:030dafb5dc9cf002817a852901f9587664f7a28b633202333832a37b7bdf1925 , StatefulSetStatus = ./defaults/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:df00b00193ba5c81dc29f3f1f1ee7eeed0bb1ee64370e598d78528e7d5382981 , StatefulSetUpdateStrategy = diff --git a/1.18/package.dhall b/1.18/package.dhall index e7dd319..a8458d6 100644 --- a/1.18/package.dhall +++ b/1.18/package.dhall @@ -1,7 +1,7 @@ - ./schemas.dhall sha256:f2b22e8d2400d7698bc05e47d9e945b4d795e3290b114a20657ef93c0e9557ce + ./schemas.dhall sha256:eef4af98603d6244a204cd63b0287658a5cd7be1c25519c4ad2aaa3302f25751 ∧ { IntOrString = - ( ./types.dhall sha256:1ed41a6cc92b378b1f72cd15b8d70edeadec7d1f23c3a47738a09a4ae029403b + ( ./types.dhall sha256:b995d71b5750d1b8c38c50e2d683b7fc8af0d37f668f56b96089fdf4e483c7eb ).IntOrString , Resource = - ./typesUnion.dhall sha256:6e4f57f3965cc61e17b29ba18871a3bf49f9c19342b5fa908cb3661c782b4fe4 + ./typesUnion.dhall sha256:c53ad6e5b9d6ff7d4e7ce7e7ada3ecb23282042311281e5d45b81f0f0d0ae7e8 } diff --git a/1.18/schemas.dhall b/1.18/schemas.dhall index abf9af3..66f51f7 100644 --- a/1.18/schemas.dhall +++ b/1.18/schemas.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./schemas/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:0471cec7aab65313bb60ff3f774ee8d8c8e406f16b34f3dd27b50659055acecb , StatefulSet = - ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:8a6c4866f8cb336b59b89f2faa19711fc220bc8d202ee834abf2a40be548f4d4 + ./schemas/io.k8s.api.apps.v1.StatefulSet.dhall sha256:81968deb7f40b951d5ea01ecd15d2acd857a0782300a4e345ccbd9f120d607b3 , StatefulSetCondition = ./schemas/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:47ec59edf7c6f9429301ee78bfdfc84bbfdbf494fe3b461db05ae03de8c6817d , StatefulSetList = - ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:9b8485f99a336b723c1978e5d71737d5415360bbe6664d2daf96ab5a7121a48e + ./schemas/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:3e0e4d675cd50e13b5da9f91c8ea3774cb0ba2ba52be18eb1e156b11cbed92a6 , StatefulSetSpec = - ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:f84af856560d01886a1979626ee96ecfe8298dca5c1078d838a141b03e7e6813 + ./schemas/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:38f9cfa74aa690e546fba27bd9f23bb6c245bc16a9e3e5864402718e14b9ed55 , StatefulSetStatus = ./schemas/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:a490d193b72e53cbb9b1fe35dde9bc02415e3f01bf8ce8a516ddbad25855df42 , StatefulSetUpdateStrategy = @@ -409,11 +409,11 @@ , PersistentVolume = ./schemas/io.k8s.api.core.v1.PersistentVolume.dhall sha256:07ee3c061a27d126dad0bdae853da77f6f3f18e7e7a72a5eaea9e7b8663500ad , PersistentVolumeClaim = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:77bb81693df32d1ef5ea83aad4c5bc36ada88fdc9aef29abb6f71348967ca868 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:81005f0b9a9aab7008deb08e4615b8af233dcca25aa0e894f30eeb0430c4d406 , PersistentVolumeClaimCondition = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:6d9583ad8e06d58d2ad644b0ed01b6514e879b734bc81a54cf029060cc3bf76d , PersistentVolumeClaimList = - ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:fcd640a855d397128a0bf4637e7425529a12a8e15ea3138e8ac8975bef904218 + ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:31ee43cbecd4860fbf7d03c6d65fc049d26a5db6d40ac527b9bafbacbf7d4e4d , PersistentVolumeClaimSpec = ./schemas/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:12b5ccf65c03ad276ec6d8f4e24d49dd86bb82ab0fbf7a0ce3a73cbe4a612fff , PersistentVolumeClaimStatus = diff --git a/1.18/types.dhall b/1.18/types.dhall index d3ca9e2..7611f57 100644 --- a/1.18/types.dhall +++ b/1.18/types.dhall @@ -57,13 +57,13 @@ , RollingUpdateStatefulSetStrategy = ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b , StatefulSet = - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d1e192448c23496e74b34bcea1404d2534b642be162da7a1363ac0b09fa48214 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1c882a7a2d5cb443bdcd2b30780723ab9de08f0aa62e244797a1da7b408e4270 , StatefulSetCondition = ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d , StatefulSetList = - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:48fd786f0143ed69c6b6dc940cf8d747bc43b7094759a683796c1f27ce388231 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:109d1120983e226ba37afbfc62945e33dd9c61b2bd5a22a2f06967a1deea1d21 , StatefulSetSpec = - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:603ed4bd2c22e8ee72f03d8204b5091a5de7fc15d35d924a87d25d51ba03733e + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:501f01e3cce1f36350606397c92e6b4e4b1725b8d59408d5713e561abdae1810 , StatefulSetStatus = ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 , StatefulSetUpdateStrategy = @@ -409,11 +409,11 @@ , PersistentVolume = ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 , PersistentVolumeClaim = - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 , PersistentVolumeClaimCondition = ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 , PersistentVolumeClaimList = - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 , PersistentVolumeClaimSpec = ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 , PersistentVolumeClaimStatus = diff --git a/1.18/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall b/1.18/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall index 3946595..b412a40 100644 --- a/1.18/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall +++ b/1.18/types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall @@ -1,6 +1,6 @@ -{ apiVersion : Text -, kind : Text -, metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +{ metadata : ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall +, apiVersion : Optional Text +, kind : Optional Text , spec : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall , status : Optional ./io.k8s.api.core.v1.PersistentVolumeClaimStatus.dhall } diff --git a/1.18/typesUnion.dhall b/1.18/typesUnion.dhall index 14adb31..2963c60 100644 --- a/1.18/typesUnion.dhall +++ b/1.18/typesUnion.dhall @@ -57,13 +57,13 @@ | RollingUpdateStatefulSetStrategy : ./types/io.k8s.api.apps.v1.RollingUpdateStatefulSetStrategy.dhall sha256:dad33ff65dde525b0796a1d7e81a345d4ae973743e3267be3a1bd0722cf5ab4b | StatefulSet : - ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:d1e192448c23496e74b34bcea1404d2534b642be162da7a1363ac0b09fa48214 + ./types/io.k8s.api.apps.v1.StatefulSet.dhall sha256:1c882a7a2d5cb443bdcd2b30780723ab9de08f0aa62e244797a1da7b408e4270 | StatefulSetCondition : ./types/io.k8s.api.apps.v1.StatefulSetCondition.dhall sha256:10de5e5aed3f6e1721f79bd8e2f9ffcecb92658fbe7442e6eaf74c6780b4779d | StatefulSetList : - ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:48fd786f0143ed69c6b6dc940cf8d747bc43b7094759a683796c1f27ce388231 + ./types/io.k8s.api.apps.v1.StatefulSetList.dhall sha256:109d1120983e226ba37afbfc62945e33dd9c61b2bd5a22a2f06967a1deea1d21 | StatefulSetSpec : - ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:603ed4bd2c22e8ee72f03d8204b5091a5de7fc15d35d924a87d25d51ba03733e + ./types/io.k8s.api.apps.v1.StatefulSetSpec.dhall sha256:501f01e3cce1f36350606397c92e6b4e4b1725b8d59408d5713e561abdae1810 | StatefulSetStatus : ./types/io.k8s.api.apps.v1.StatefulSetStatus.dhall sha256:d5a3a33833911b1885d22dd9d5a8a90cb93d106d31b0690c81159288005a7c06 | StatefulSetUpdateStrategy : @@ -409,11 +409,11 @@ | PersistentVolume : ./types/io.k8s.api.core.v1.PersistentVolume.dhall sha256:5ad41c573b8fadd70e1ccf93de234fdd9a13f8b068691ba4fa12d3429a574b39 | PersistentVolumeClaim : - ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:8871db06b6afbd573730f5a093c4df5df7d9c418a2a7b3d0b4ecbe7e77aca10f + ./types/io.k8s.api.core.v1.PersistentVolumeClaim.dhall sha256:c0b22f68b129647faeda39a8643944b09c19c9e6cab8daf33a8d1076511a2462 | PersistentVolumeClaimCondition : ./types/io.k8s.api.core.v1.PersistentVolumeClaimCondition.dhall sha256:253ee70013b7ce83570cd49d6e14c029e6f652e7e70b1fac3b10213619d42f05 | PersistentVolumeClaimList : - ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:258de85bca191584d33034bfa751d87920b171a79292e57238f63b162b57fd74 + ./types/io.k8s.api.core.v1.PersistentVolumeClaimList.dhall sha256:cc9a957d150fd98d26a9fd720c3664066961718e67890315027c597f83c5d857 | PersistentVolumeClaimSpec : ./types/io.k8s.api.core.v1.PersistentVolumeClaimSpec.dhall sha256:21005ba2eea7e5a8172fba37e1bb64623aa1fbef02f6dfff2f891d00584d2a61 | PersistentVolumeClaimStatus : diff --git a/README.md b/README.md index 0b848fb..f8ea141 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ In the following example, we: -- examples/deploymentSimple.dhall let kubernetes = - https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ @@ -148,7 +148,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let Service = { name : Text, host : Text, version : Text } diff --git a/examples/aws-iam-authenticator-chart.dhall b/examples/aws-iam-authenticator-chart.dhall index 5cf6ec0..753959b 100644 --- a/examples/aws-iam-authenticator-chart.dhall +++ b/examples/aws-iam-authenticator-chart.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let release = "wintering-rodent" diff --git a/examples/deployment.dhall b/examples/deployment.dhall index f47f799..54a1397 100644 --- a/examples/deployment.dhall +++ b/examples/deployment.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ diff --git a/examples/deploymentSimple.dhall b/examples/deploymentSimple.dhall index 528ead9..aed387f 100644 --- a/examples/deploymentSimple.dhall +++ b/examples/deploymentSimple.dhall @@ -1,5 +1,5 @@ let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let deployment = kubernetes.Deployment::{ diff --git a/examples/ingress.dhall b/examples/ingress.dhall index 2dffa60..975b583 100644 --- a/examples/ingress.dhall +++ b/examples/ingress.dhall @@ -4,7 +4,7 @@ let Prelude = let map = Prelude.List.map let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let Service = { name : Text, host : Text, version : Text } diff --git a/examples/service.dhall b/examples/service.dhall index a743470..71c4dbb 100644 --- a/examples/service.dhall +++ b/examples/service.dhall @@ -2,7 +2,7 @@ let Prelude = ../Prelude.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e let kubernetes = - ../package.dhall sha256:7150ac4309a091740321a3a3582e7695ee4b81732ce8f1ed1691c1c52791daa1 + ../package.dhall sha256:d541487f153cee9890ebe4145bae8899e91cd81e2f4a5b65b06dfc325fb1ae7e let spec = { selector = Some (toMap { app = "nginx" }) diff --git a/nix/dhall-haskell.json b/nix/dhall-haskell.json index 95ed6ad..198a939 100644 --- a/nix/dhall-haskell.json +++ b/nix/dhall-haskell.json @@ -1,7 +1,7 @@ { "url": "https://github.com/dhall-lang/dhall-haskell.git", - "rev": "186cad7c7caf2d15c37bb5dcdac557535c648cc4", - "date": "2020-08-26T02:27:04+00:00", - "sha256": "0l5zr6di3k7934ayqd4rv3z8sjy55h2klvnqrd6k7adfk8ycnd97", + "rev": "70d494be474b007240754a1e4a6ee1c5e6fc77f3", + "date": "2020-09-06T18:10:01-07:00", + "sha256": "1ivimh6lfbycqfv9dskxq5bg10nkw4k8z5kqy5905v0yd1f6mdvk", "fetchSubmodules": true } From efb745854ac8d25a21ca63d4bcc0cedaf2652c14 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Fri, 11 Sep 2020 18:11:01 -0700 Subject: [PATCH 3/3] Fix CI to check that generation script has run (#145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … based on the discussion in #138 CI wasn't checking that the `./scripts/generate.sh` script had been run, which this change fixes --- nix/nixpkgs.nix | 35 ++++++++++++++++++++++++++++++----- release.nix | 4 +++- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index e254bb1..77defb9 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -88,7 +88,7 @@ let in ''echo './${inputFile} → ./${outputFile}' ${pkgsNew.dhall-json}/bin/dhall-to-yaml --file $out/${inputFile} > $out/${outputFile} - ''; + ''; in pkgsNew.runCommand "package-${drv.name}" { XDG_CACHE_HOME="."; } '' @@ -106,15 +106,40 @@ let outputFile = "README.md"; in - pkgsNew.lib.optionalString (version == preferredVersion) - ''echo './${inputFile} → ./${outputFile}' - ${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} | ${pkgsNew.gnused}/bin/sed 's_\.\./package.dhall_https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall_g' > $out/${outputFile} - '' + if (version == preferredVersion) + then + ''echo './${inputFile} → ./${outputFile}' + + ${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} | ${pkgsNew.gnused}/bin/sed 's_\.\./package.dhall_https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall_g' > $out/${outputFile} + '' + else + '' + ${pkgsNew.coreutils}/bin/rm --recursive $out/examples + '' } + ${pkgsNew.coreutils}/bin/rm --recursive $out/docs ''; dhall-kubernetes = pkgsNew.callPackage ./dhall-kubernetes.nix {}; + dhall-kubernetes-tests = + let + process = version: derivation: { + name = "${version}-test"; + value = + pkgsNew.runCommand "test-dhall-kubernetes-${version}" {} '' + ${pkgsNew.rsync}/bin/rsync --archive ${derivation}/ ./${version}.expected + ${pkgsNew.rsync}/bin/rsync --archive ${../. + "/${version}"}/ ./${version}.actual + + ${pkgsNew.diffutils}/bin/diff --recursive ./${version}.{actual,expected} + + touch $out + ''; + }; + + in + pkgsNew.lib.mapAttrs' process pkgsNew.dhall-kubernetes; + haskellPackages = pkgsOld.haskellPackages.override (old: { overrides = let diff --git a/release.nix b/release.nix index 1a736a5..fb5ba20 100644 --- a/release.nix +++ b/release.nix @@ -12,7 +12,9 @@ let # master in). rev = pkgs.runCommand "rev" {} ''echo "${src.rev}" > $out''; } // builtins.removeAttrs pkgs.dhall-kubernetes - [ "override" "overrideDerivation" ]; + [ "override" "overrideDerivation" ] + // builtins.removeAttrs pkgs.dhall-kubernetes-tests + [ "override-test" "overrideDerivation-test" ]; dhall-kubernetes = pkgs.releaseTools.aggregate { name = "dhall-kubernetes-aggregate";