Update to the latest Kubernetes version

Modify Kubernetes generator to support more cases (#69) * Adjust dhall-kubernetes-generator to handle different swagger specs Remove defaults for lists
dhall-lang · f-f · Jul 30, 2019 · Jul 12, 2019 · Jul 28, 2019 · Jul 30, 2019
commit 95c1fdaf7464a1750d545f0619c39e7d4b804e18
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ README.md: docs/README.md.dhall
 	./scripts/build-readme.sh
 
 build:  README.md
-	mkdir -p types default
+	mkdir -p types defaults
 	dhall-kubernetes-generator "${OPENAPI_SPEC}"
 
 	dhall freeze --all --inplace ./types.dhall

diff --git a/README.md b/README.md
@@ -62,10 +62,10 @@ In the following example, we:
 -- examples/deploymentSimple.dhall
 
 let types =
-      ../types.dhall sha256:29d8c4387540826a68775e9439e8d00f226d440a83dedf80ff877c612fa524a2
+      ../types.dhall sha256:e48e21b807dad217a6c3e631fcaf3e950062310bfb4a8bbcecc330eb7b2f60ed
 
 let defaults =
-      ../defaults.dhall sha256:7fb71a223f3aeb4f72824303f7cbfdd038bb2b7a7dc1f76db7e65031dad0523c
+      ../defaults.dhall sha256:4450e23dc81975d111650e06c0238862944bf699537af6cbacac9c7e471dfabe
 
 let deployment
     : types.Deployment
@@ -170,10 +170,10 @@ let map = Prelude.`List`.map
 let kv = Prelude.JSON.keyText
 
 let types =
-      ../types.dhall sha256:29d8c4387540826a68775e9439e8d00f226d440a83dedf80ff877c612fa524a2
+      ../types.dhall sha256:e48e21b807dad217a6c3e631fcaf3e950062310bfb4a8bbcecc330eb7b2f60ed
 
 let defaults =
-      ../defaults.dhall sha256:7fb71a223f3aeb4f72824303f7cbfdd038bb2b7a7dc1f76db7e65031dad0523c
+      ../defaults.dhall sha256:4450e23dc81975d111650e06c0238862944bf699537af6cbacac9c7e471dfabe
 
 let Service = { name : Text, host : Text, version : Text }
 
@@ -258,7 +258,7 @@ Result:
 ```yaml
 ## examples/out/ingress.yaml
 
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 spec:
   rules:

diff --git a/defaults.dhall b/defaults.dhall
diff --git a/defaults/io.k8s.api.admissionregistration.v1alpha1.Initializer.dhall b/defaults/io.k8s.api.admissionregistration.v1alpha1.Initializer.dhall
diff --git a/defaults/io.k8s.api.admissionregistration.v1alpha1.InitializerConfiguration.dhall b/defaults/io.k8s.api.admissionregistration.v1alpha1.InitializerConfiguration.dhall
diff --git a/defaults/io.k8s.api.admissionregistration.v1alpha1.InitializerConfigurationList.dhall b/defaults/io.k8s.api.admissionregistration.v1alpha1.InitializerConfigurationList.dhall
diff --git a/defaults/io.k8s.api.admissionregistration.v1alpha1.Rule.dhall b/defaults/io.k8s.api.admissionregistration.v1alpha1.Rule.dhall
diff --git a/defaults/io.k8s.api.admissionregistration.v1beta1.RuleWithOperations.dhall b/defaults/io.k8s.api.admissionregistration.v1beta1.RuleWithOperations.dhall
@@ -6,4 +6,6 @@
     [] : List Text
 , resources =
     [] : List Text
+, scope =
+    None Text
 }
diff --git a/defaults/io.k8s.api.admissionregistration.v1beta1.Webhook.dhall b/defaults/io.k8s.api.admissionregistration.v1beta1.Webhook.dhall
@@ -1,4 +1,6 @@
-{ clientConfig =
+{ admissionReviewVersions =
+    [] : List Text
+, clientConfig =
     ./io.k8s.api.admissionregistration.v1beta1.WebhookClientConfig.dhall
 , rules =
     [] : List
@@ -9,4 +11,6 @@
     None ./../types/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector.dhall
 , sideEffects =
     None Text
+, timeoutSeconds =
+    None Natural
 }
diff --git a/defaults/io.k8s.api.coordination.v1.Lease.dhall b/defaults/io.k8s.api.coordination.v1.Lease.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "coordination.k8s.io/v1"
+, kind =
+    "Lease"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, spec =
+    ./io.k8s.api.coordination.v1.LeaseSpec.dhall
+}
diff --git a/defaults/io.k8s.api.coordination.v1.LeaseList.dhall b/defaults/io.k8s.api.coordination.v1.LeaseList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "coordination.k8s.io/v1"
+, kind =
+    "LeaseList"
+, items =
+    [] : List ./../types/io.k8s.api.coordination.v1.Lease.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.coordination.v1.LeaseSpec.dhall b/defaults/io.k8s.api.coordination.v1.LeaseSpec.dhall
@@ -0,0 +1,11 @@
+{ acquireTime =
+    None ./../types/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime.dhall
+, holderIdentity =
+    None Text
+, leaseDurationSeconds =
+    None Natural
+, leaseTransitions =
+    None Natural
+, renewTime =
+    None ./../types/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime.dhall
+}
diff --git a/defaults/io.k8s.api.core.v1.CSIVolumeSource.dhall b/defaults/io.k8s.api.core.v1.CSIVolumeSource.dhall
@@ -0,0 +1,9 @@
+{ nodePublishSecretRef =
+    ./io.k8s.api.core.v1.LocalObjectReference.dhall
+, volumeAttributes =
+    [] : List { mapKey : Text, mapValue : Text }
+, fsType =
+    None Text
+, readOnly =
+    None Bool
+}
diff --git a/defaults/io.k8s.api.core.v1.QuobyteVolumeSource.dhall b/defaults/io.k8s.api.core.v1.QuobyteVolumeSource.dhall
@@ -1 +1,9 @@
-{ group = None Text, readOnly = None Bool, user = None Text }
+{ group =
+    None Text
+, readOnly =
+    None Bool
+, tenant =
+    None Text
+, user =
+    None Text
+}
diff --git a/defaults/io.k8s.api.core.v1.Volume.dhall b/defaults/io.k8s.api.core.v1.Volume.dhall
@@ -14,6 +14,8 @@
     None ./../types/io.k8s.api.core.v1.CinderVolumeSource.dhall
 , configMap =
     None ./../types/io.k8s.api.core.v1.ConfigMapVolumeSource.dhall
+, csi =
+    None ./../types/io.k8s.api.core.v1.CSIVolumeSource.dhall
 , downwardAPI =
     None ./../types/io.k8s.api.core.v1.DownwardAPIVolumeSource.dhall
 , fc =

diff --git a/defaults/io.k8s.api.core.v1.VolumeMount.dhall b/defaults/io.k8s.api.core.v1.VolumeMount.dhall
@@ -1 +1,9 @@
-{ mountPropagation = None Text, readOnly = None Bool, subPath = None Text }
+{ mountPropagation =
+    None Text
+, readOnly =
+    None Bool
+, subPath =
+    None Text
+, subPathExpr =
+    None Text
+}
diff --git a/...ta1.CustomResourceSubresourceStatus.dhall → ...extensions.v1beta1.AllowedCSIDriver.dhall b/...ta1.CustomResourceSubresourceStatus.dhall → ...extensions.v1beta1.AllowedCSIDriver.dhall
diff --git a/defaults/io.k8s.api.extensions.v1beta1.PodSecurityPolicySpec.dhall b/defaults/io.k8s.api.extensions.v1beta1.PodSecurityPolicySpec.dhall
@@ -1,4 +1,6 @@
-{ allowedCapabilities =
+{ allowedCSIDrivers =
+    [] : List ./../types/io.k8s.api.extensions.v1beta1.AllowedCSIDriver.dhall
+, allowedCapabilities =
     [] : List Text
 , allowedFlexVolumes =
     [] : List ./../types/io.k8s.api.extensions.v1beta1.AllowedFlexVolume.dhall

diff --git a/defaults/io.k8s.api.networking.v1beta1.HTTPIngressPath.dhall b/defaults/io.k8s.api.networking.v1beta1.HTTPIngressPath.dhall
@@ -0,0 +1,5 @@
+{ backend =
+    ./io.k8s.api.networking.v1beta1.IngressBackend.dhall
+, path =
+    None Text
+}
diff --git a/defaults/io.k8s.api.networking.v1beta1.HTTPIngressRuleValue.dhall b/defaults/io.k8s.api.networking.v1beta1.HTTPIngressRuleValue.dhall
@@ -0,0 +1,3 @@
+{ paths =
+    [] : List ./../types/io.k8s.api.networking.v1beta1.HTTPIngressPath.dhall
+}
diff --git a/defaults/io.k8s.api.networking.v1beta1.Ingress.dhall b/defaults/io.k8s.api.networking.v1beta1.Ingress.dhall
@@ -0,0 +1,11 @@
+{ apiVersion =
+    "networking.k8s.io/v1beta1"
+, kind =
+    "Ingress"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, status =
+    ./io.k8s.api.networking.v1beta1.IngressStatus.dhall
+, spec =
+    None ./../types/io.k8s.api.networking.v1beta1.IngressSpec.dhall
+}
diff --git a/...apimachinery.pkg.apis.meta.v1.Patch.dhall → ...i.networking.v1beta1.IngressBackend.dhall b/...apimachinery.pkg.apis.meta.v1.Patch.dhall → ...i.networking.v1beta1.IngressBackend.dhall
diff --git a/defaults/io.k8s.api.networking.v1beta1.IngressList.dhall b/defaults/io.k8s.api.networking.v1beta1.IngressList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "networking.k8s.io/v1beta1"
+, kind =
+    "IngressList"
+, items =
+    [] : List ./../types/io.k8s.api.networking.v1beta1.Ingress.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.networking.v1beta1.IngressRule.dhall b/defaults/io.k8s.api.networking.v1beta1.IngressRule.dhall
@@ -0,0 +1,5 @@
+{ host =
+    None Text
+, http =
+    None ./../types/io.k8s.api.networking.v1beta1.HTTPIngressRuleValue.dhall
+}
diff --git a/defaults/io.k8s.api.networking.v1beta1.IngressSpec.dhall b/defaults/io.k8s.api.networking.v1beta1.IngressSpec.dhall
@@ -0,0 +1,7 @@
+{ rules =
+    [] : List ./../types/io.k8s.api.networking.v1beta1.IngressRule.dhall
+, tls =
+    [] : List ./../types/io.k8s.api.networking.v1beta1.IngressTLS.dhall
+, backend =
+    None ./../types/io.k8s.api.networking.v1beta1.IngressBackend.dhall
+}
diff --git a/defaults/io.k8s.api.networking.v1beta1.IngressStatus.dhall b/defaults/io.k8s.api.networking.v1beta1.IngressStatus.dhall
@@ -0,0 +1 @@
+{ loadBalancer = None ./../types/io.k8s.api.core.v1.LoadBalancerStatus.dhall }
diff --git a/defaults/io.k8s.api.networking.v1beta1.IngressTLS.dhall b/defaults/io.k8s.api.networking.v1beta1.IngressTLS.dhall
@@ -0,0 +1 @@
+{ hosts = [] : List Text, secretName = None Text }
diff --git a/defaults/io.k8s.api.node.v1alpha1.RuntimeClass.dhall b/defaults/io.k8s.api.node.v1alpha1.RuntimeClass.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "node.k8s.io/v1alpha1"
+, kind =
+    "RuntimeClass"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, spec =
+    ./io.k8s.api.node.v1alpha1.RuntimeClassSpec.dhall
+}
diff --git a/defaults/io.k8s.api.node.v1alpha1.RuntimeClassList.dhall b/defaults/io.k8s.api.node.v1alpha1.RuntimeClassList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "node.k8s.io/v1alpha1"
+, kind =
+    "RuntimeClassList"
+, items =
+    [] : List ./../types/io.k8s.api.node.v1alpha1.RuntimeClass.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.node.v1alpha1.RuntimeClassSpec.dhall b/defaults/io.k8s.api.node.v1alpha1.RuntimeClassSpec.dhall
@@ -0,0 +1 @@
+{=}
diff --git a/defaults/io.k8s.api.node.v1beta1.RuntimeClass.dhall b/defaults/io.k8s.api.node.v1beta1.RuntimeClass.dhall
@@ -0,0 +1,7 @@
+{ apiVersion =
+    "node.k8s.io/v1beta1"
+, kind =
+    "RuntimeClass"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+}
diff --git a/defaults/io.k8s.api.node.v1beta1.RuntimeClassList.dhall b/defaults/io.k8s.api.node.v1beta1.RuntimeClassList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "node.k8s.io/v1beta1"
+, kind =
+    "RuntimeClassList"
+, items =
+    [] : List ./../types/io.k8s.api.node.v1beta1.RuntimeClass.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.policy.v1beta1.AllowedCSIDriver.dhall b/defaults/io.k8s.api.policy.v1beta1.AllowedCSIDriver.dhall
@@ -0,0 +1 @@
+{=}
diff --git a/defaults/io.k8s.api.policy.v1beta1.PodSecurityPolicySpec.dhall b/defaults/io.k8s.api.policy.v1beta1.PodSecurityPolicySpec.dhall
@@ -1,4 +1,6 @@
-{ allowedCapabilities =
+{ allowedCSIDrivers =
+    [] : List ./../types/io.k8s.api.policy.v1beta1.AllowedCSIDriver.dhall
+, allowedCapabilities =
     [] : List Text
 , allowedFlexVolumes =
     [] : List ./../types/io.k8s.api.policy.v1beta1.AllowedFlexVolume.dhall

diff --git a/defaults/io.k8s.api.scheduling.v1.PriorityClass.dhall b/defaults/io.k8s.api.scheduling.v1.PriorityClass.dhall
@@ -0,0 +1,11 @@
+{ apiVersion =
+    "scheduling.k8s.io/v1"
+, kind =
+    "PriorityClass"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, description =
+    None Text
+, globalDefault =
+    None Bool
+}
diff --git a/defaults/io.k8s.api.scheduling.v1.PriorityClassList.dhall b/defaults/io.k8s.api.scheduling.v1.PriorityClassList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "scheduling.k8s.io/v1"
+, kind =
+    "PriorityClassList"
+, items =
+    [] : List ./../types/io.k8s.api.scheduling.v1.PriorityClass.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSIDriver.dhall b/defaults/io.k8s.api.storage.v1beta1.CSIDriver.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "storage.k8s.io/v1beta1"
+, kind =
+    "CSIDriver"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, spec =
+    ./io.k8s.api.storage.v1beta1.CSIDriverSpec.dhall
+}
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSIDriverList.dhall b/defaults/io.k8s.api.storage.v1beta1.CSIDriverList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "storage.k8s.io/v1beta1"
+, kind =
+    "CSIDriverList"
+, items =
+    [] : List ./../types/io.k8s.api.storage.v1beta1.CSIDriver.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSIDriverSpec.dhall b/defaults/io.k8s.api.storage.v1beta1.CSIDriverSpec.dhall
@@ -0,0 +1 @@
+{ attachRequired = None Bool, podInfoOnMount = None Bool }
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSINode.dhall b/defaults/io.k8s.api.storage.v1beta1.CSINode.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "storage.k8s.io/v1beta1"
+, kind =
+    "CSINode"
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta.dhall
+, spec =
+    ./io.k8s.api.storage.v1beta1.CSINodeSpec.dhall
+}
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSINodeDriver.dhall b/defaults/io.k8s.api.storage.v1beta1.CSINodeDriver.dhall
@@ -0,0 +1 @@
+{ topologyKeys = [] : List Text }
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSINodeList.dhall b/defaults/io.k8s.api.storage.v1beta1.CSINodeList.dhall
@@ -0,0 +1,9 @@
+{ apiVersion =
+    "storage.k8s.io/v1beta1"
+, kind =
+    "CSINodeList"
+, items =
+    [] : List ./../types/io.k8s.api.storage.v1beta1.CSINode.dhall
+, metadata =
+    ./io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta.dhall
+}
diff --git a/defaults/io.k8s.api.storage.v1beta1.CSINodeSpec.dhall b/defaults/io.k8s.api.storage.v1beta1.CSINodeSpec.dhall
@@ -0,0 +1,3 @@
+{ drivers =
+    [] : List ./../types/io.k8s.api.storage.v1beta1.CSINodeDriver.dhall
+}
diff --git a/...k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceConversion.dhall b/...k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceConversion.dhall
@@ -1,3 +1,5 @@
-{ webhookClientConfig =
+{ conversionReviewVersions =
+    [] : List Text
+, webhookClientConfig =
     ./io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.WebhookClientConfig.dhall
 }
diff --git a/...s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceSubresources.dhall b/...s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceSubresources.dhall
@@ -1,6 +1,4 @@
-{ status =
-    ./io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceSubresourceStatus.dhall
-, scale =
+{ scale =
     None
     ./../types/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceSubresourceScale.dhall
 }
diff --git a/defaults/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps.dhall b/defaults/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps.dhall
@@ -55,6 +55,8 @@
     None Double
 , multipleOf =
     None Double
+, nullable =
+    None Bool
 , pattern =
     None Text
 , title =

diff --git a/defaults/io.k8s.apimachinery.pkg.apis.meta.v1.APIResource.dhall b/defaults/io.k8s.apimachinery.pkg.apis.meta.v1.APIResource.dhall
@@ -6,6 +6,8 @@
     [] : List Text
 , group =
     None Text
+, storageVersionHash =
+    None Text
 , version =
     None Text
 }
diff --git a/defaults/io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry.dhall b/defaults/io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry.dhall
@@ -0,0 +1,7 @@
+{ manager =
+    None Text
+, operation =
+    None Text
+, time =
+    None ./../types/io.k8s.apimachinery.pkg.apis.meta.v1.Time.dhall
+}