Update the project to use dhall-kubernetes v7.0.0 (#28)

coralogix · Oct 2, 2023 · 01a1e3b · 01a1e3b
1 parent 68a53cf
commit 01a1e3b
Show file tree

Hide file tree

Showing 58 changed files with 678 additions and 382 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ in PrometheusOperator.ServiceMonitor::{
        , endpoints =
          Some [ PrometheusOperator.Endpoint.Union.TargetPort
              PrometheusOperator.Endpoint.TargetPort::{
-             , targetPort = Kubernetes.IntOrString.String "example"
+             , targetPort = Kubernetes.NatOrString.String "example"
              , interval = Some "60s"
              , scrapeTimeout = Some "40s"
              }

diff --git a/imports.dhall b/imports.dhall
@@ -1,5 +1,7 @@
 { Kubernetes =
-    https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/v6.0.0/package.dhall sha256:532e110f424ea8a9f960a13b2ca54779ddcac5d5aa531f86d82f41f8f18d7ef1
+      https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/v7.0.0/package.dhall sha256:705f7bd1c157c5544143ab5917bdc3972fe941300ce4189a8ea89e6ddd9c1875
+    ? https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/v7.0.0/package.dhall
 , Prelude =
-    https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
+      https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
+    ? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v17.0.0/Prelude/package.dhall
 }
diff --git a/package.dhall b/package.dhall
@@ -1,4 +1,4 @@
 { v1 =
-      ./v1/package.dhall sha256:16d235d47f572d242a409c67167b68f99ac05c40dc6e31ed362916070c3ad320
+      ./v1/package.dhall sha256:1443b1a580900147c97cea725c197652e26ca766bb8f785f468e0f3019545276
     ? ./v1/package.dhall
 }
diff --git a/v1/APIServerConfig.dhall b/v1/APIServerConfig.dhall
@@ -1,6 +1,10 @@
-let BasicAuth = ./BasicAuth.dhall
+let BasicAuth =
+        ./BasicAuth.dhall sha256:2ce5199f94352d1293242b1e97ab6bad6c29f34d8df163676c4487e3c5dae3af
+      ? ./BasicAuth.dhall
 
-let TLSConfig = ./TLSConfig.dhall
+let TLSConfig =
+        ./TLSConfig.dhall sha256:58054c5f17cbc2ae2bde2cf6acfec263045e9b841d8e60d0f5db152dffafa5cf
+      ? ./TLSConfig.dhall
 
 let Common = { host : Text, tlsConfig : Optional TLSConfig.Type }
 
@@ -24,9 +28,14 @@ let APIServerConfig =
       }
 
 let test =
-      let Kubernetes = (../imports.dhall).Kubernetes
+      let Kubernetes =
+            (   ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+              ? ../imports.dhall
+            ).Kubernetes
 
-      let BasicAuth = ./BasicAuth.dhall
+      let BasicAuth =
+              ./BasicAuth.dhall sha256:2ce5199f94352d1293242b1e97ab6bad6c29f34d8df163676c4487e3c5dae3af
+            ? ./BasicAuth.dhall
 
       in  { basicAuth =
               APIServerConfig.Type.BasicAuth

diff --git a/v1/AlertingSpec.dhall b/v1/AlertingSpec.dhall
@@ -1,4 +1,6 @@
-let AlertmanagerEndpoints = ./AlertmanagerEndpoints.dhall
+let AlertmanagerEndpoints =
+        ./AlertmanagerEndpoints.dhall sha256:d628edd8a1930362f586470a5bf141bf0286e69deb463ff12cae53a34f1f3747
+      ? ./AlertmanagerEndpoints.dhall
 
 let AlertingSpec =
       { Type = { alertmanagers : Optional (List AlertmanagerEndpoints.Type) }

diff --git a/v1/Alertmanager.dhall b/v1/Alertmanager.dhall
@@ -1,10 +1,16 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let AlertmanagerSpec = ./AlertmanagerSpec.dhall
+let AlertmanagerSpec =
+        ./AlertmanagerSpec.dhall sha256:f39005803d189f9c7867e4bc88f5fd8e698c0141410505e961bbe132ab7c1ba9
+      ? ./AlertmanagerSpec.dhall
 
-let AlertmanagerStatus = ./AlertmanagerStatus.dhall
+let AlertmanagerStatus =
+        ./AlertmanagerStatus.dhall sha256:e2d018badce51e5389191631b0168799b07c220ce6a89945ec1c2732d5a5cb2e
+      ? ./AlertmanagerStatus.dhall
 
 in  { Type =
         { apiVersion : Text

diff --git a/v1/AlertmanagerConfig.dhall b/v1/AlertmanagerConfig.dhall
@@ -1,8 +1,12 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let AlertmanagerConfigSpec = ./AlertmanagerConfigSpec.dhall
+let AlertmanagerConfigSpec =
+        ./AlertmanagerConfigSpec.dhall sha256:b9487178302a27b6ff8aa47180cd23c9be20471436fe8981dceb8be28e4d09da
+      ? ./AlertmanagerConfigSpec.dhall
 
 let Generator =
       λ(ConfigSpec : Type) →

diff --git a/v1/AlertmanagerConfigList.dhall b/v1/AlertmanagerConfigList.dhall
@@ -1,8 +1,12 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let AlertmanagerConfigSpec = ./AlertmanagerConfigSpec.dhall
+let AlertmanagerConfigSpec =
+        ./AlertmanagerConfigSpec.dhall sha256:b9487178302a27b6ff8aa47180cd23c9be20471436fe8981dceb8be28e4d09da
+      ? ./AlertmanagerConfigSpec.dhall
 
 let Generator =
       λ(ConfigSpec : Type) →
@@ -20,7 +24,9 @@ let Generator =
         }
 
 let test =
-      let AlertmanagerConfigSpec = ./AlertmanagerConfigSpec.dhall
+      let AlertmanagerConfigSpec =
+              ./AlertmanagerConfigSpec.dhall sha256:b9487178302a27b6ff8aa47180cd23c9be20471436fe8981dceb8be28e4d09da
+            ? ./AlertmanagerConfigSpec.dhall
 
       in  (Generator AlertmanagerConfigSpec.Simple.Type)::{
           , items = [] : List AlertmanagerConfigSpec.Simple.Type

diff --git a/v1/AlertmanagerConfigSpec.dhall b/v1/AlertmanagerConfigSpec.dhall
@@ -1,10 +1,16 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let Receiver = ./Receiver.dhall
+let Receiver =
+        ./Receiver.dhall sha256:10acdd3e184cf84e1fa59db34d56fe926c9d661ac4a1b39adf4eabffcdb90564
+      ? ./Receiver.dhall
 
-let InhibitRule = ./InhibitRule.dhall
+let InhibitRule =
+        ./InhibitRule.dhall sha256:a2c058aaf87549e02bf31cdd9cb1d45e386faffc98c53a6fc964a64f894c758c
+      ? ./InhibitRule.dhall
 
 let Generator =
       λ(Route : Type) →
@@ -23,7 +29,9 @@ let Generator =
 let test = (Generator <>)::{=}
 
 let Simple =
-      let Route = ./Route.dhall
+      let Route =
+              ./Route.dhall sha256:07329d1a72d3e3a3410cf74e7295b095a20cbf2c21da9a5b60f907300590914d
+            ? ./Route.dhall
 
       let SimpleRootRoute = Route.Root
 

diff --git a/v1/AlertmanagerEndpoints.dhall b/v1/AlertmanagerEndpoints.dhall
@@ -1,11 +1,16 @@
-let IntOrString = (../imports.dhall).Kubernetes.IntOrString
+let NatOrString =
+      (   ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+        ? ../imports.dhall
+      ).Kubernetes.NatOrString
 
-let TLSConfig = ./TLSConfig.dhall
+let TLSConfig =
+        ./TLSConfig.dhall sha256:58054c5f17cbc2ae2bde2cf6acfec263045e9b841d8e60d0f5db152dffafa5cf
+      ? ./TLSConfig.dhall
 
 in  { Type =
         { namespace : Text
         , name : Text
-        , port : IntOrString
+        , port : NatOrString
         , scheme : Optional Text
         , pathPrefix : Optional Text
         , tlsConfig : Optional TLSConfig.Type

diff --git a/v1/AlertmanagerList.dhall b/v1/AlertmanagerList.dhall
@@ -1,6 +1,11 @@
-let ListMeta = (../imports.dhall).Kubernetes.ListMeta.Type
+let ListMeta =
+      (   ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+        ? ../imports.dhall
+      ).Kubernetes.ListMeta.Type
 
-let Alertmanager = ./Alertmanager.dhall
+let Alertmanager =
+        ./Alertmanager.dhall sha256:009ca2c566ca0d356b2ac37a79a14fe0e26b19870d02f7ebe7a436189e14098b
+      ? ./Alertmanager.dhall
 
 let AlertmanagerList =
       { Type =

diff --git a/v1/AlertmanagerSpec.dhall b/v1/AlertmanagerSpec.dhall
@@ -1,12 +1,18 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Map = imports.Prelude.Map.Type
 
 let Kubernetes = imports.Kubernetes
 
-let StorageSpec = ./StorageSpec.dhall
+let StorageSpec =
+        ./StorageSpec.dhall sha256:e73aa9d82a6b493998a99576bd22a60d658cde4d61a862ead79268450a58df55
+      ? ./StorageSpec.dhall
 
-let EmbeddedObjectMetadata = ./EmbeddedObjectMetadata.dhall
+let EmbeddedObjectMetadata =
+        ./EmbeddedObjectMetadata.dhall sha256:5a9eb9672ed429bd9d7e9aa333c30aef5c8e44ade302895f8af57f286248c8fa
+      ? ./EmbeddedObjectMetadata.dhall
 
 let AlertmanagerSpec =
       { Type =

diff --git a/v1/BasicAuth.dhall b/v1/BasicAuth.dhall
@@ -1,4 +1,7 @@
-let Kubernetes = (../imports.dhall).Kubernetes
+let Kubernetes =
+      (   ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+        ? ../imports.dhall
+      ).Kubernetes
 
 let BasicAuth =
       { Type =

diff --git a/v1/EmbeddedObjectMetadata.dhall b/v1/EmbeddedObjectMetadata.dhall
@@ -1,4 +1,6 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Map = imports.Prelude.Map.Type
 

diff --git a/v1/EmbeddedPersistentVolumeClaim.dhall b/v1/EmbeddedPersistentVolumeClaim.dhall
@@ -1,6 +1,11 @@
-let Kubernetes = (../imports.dhall).Kubernetes
+let Kubernetes =
+      (   ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+        ? ../imports.dhall
+      ).Kubernetes
 
-let EmbeddedObjectMetadata = ./EmbeddedObjectMetadata.dhall
+let EmbeddedObjectMetadata =
+        ./EmbeddedObjectMetadata.dhall sha256:5a9eb9672ed429bd9d7e9aa333c30aef5c8e44ade302895f8af57f286248c8fa
+      ? ./EmbeddedObjectMetadata.dhall
 
 in  { Type =
         { metadata : Optional EmbeddedObjectMetadata.Type

diff --git a/v1/Endpoint.dhall b/v1/Endpoint.dhall
@@ -1,14 +1,22 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Map = imports.Prelude.Map.Type
 
 let Kubernetes = imports.Kubernetes
 
-let BasicAuth = ./BasicAuth.dhall
+let BasicAuth =
+        ./BasicAuth.dhall sha256:2ce5199f94352d1293242b1e97ab6bad6c29f34d8df163676c4487e3c5dae3af
+      ? ./BasicAuth.dhall
 
-let RelabelConfig = ./RelabelConfig.dhall
+let RelabelConfig =
+        ./RelabelConfig.dhall sha256:55536331ee4787f7a5063964fbfbc3d903903deae1ccf49365211e35764361fb
+      ? ./RelabelConfig.dhall
 
-let TLSConfig = ./TLSConfig.dhall
+let TLSConfig =
+        ./TLSConfig.dhall sha256:58054c5f17cbc2ae2bde2cf6acfec263045e9b841d8e60d0f5db152dffafa5cf
+      ? ./TLSConfig.dhall
 
 let Common =
         { path : Optional Text
@@ -47,7 +55,7 @@ let common =
 
 let Port = Common ⩓ { port : Text }
 
-let TargetPort = Common ⩓ { targetPort : Kubernetes.IntOrString }
+let TargetPort = Common ⩓ { targetPort : Kubernetes.NatOrString }
 
 let Endpoint =
       { Union = < Port : Port | TargetPort : TargetPort >
@@ -60,7 +68,7 @@ let test =
       , targetPort =
           Endpoint.Union.TargetPort
             Endpoint.TargetPort::{
-            , targetPort = Kubernetes.IntOrString.Int +8080
+            , targetPort = Kubernetes.NatOrString.Nat 8080
             }
       }
 

diff --git a/v1/HTTPConfig.dhall b/v1/HTTPConfig.dhall
@@ -1,10 +1,16 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let BasicAuth = ./BasicAuth.dhall
+let BasicAuth =
+        ./BasicAuth.dhall sha256:2ce5199f94352d1293242b1e97ab6bad6c29f34d8df163676c4487e3c5dae3af
+      ? ./BasicAuth.dhall
 
-let SafeTLSConfig = ./SafeTLSConfig.dhall
+let SafeTLSConfig =
+        ./SafeTLSConfig.dhall sha256:33847e3bc9669b8e4666acb3deed9cd271ef5f45d4bfe1b36f0f416b4442c39d
+      ? ./SafeTLSConfig.dhall
 
 let HTTPConfig =
       { Type =

diff --git a/v1/InhibitRule.dhall b/v1/InhibitRule.dhall
@@ -1,6 +1,10 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
-let Matcher = ./Matcher.dhall
+let Matcher =
+        ./Matcher.dhall sha256:c8519226bf49d086fafacdac890df38fb63e10921984abfd2787e78aa3d90f3c
+      ? ./Matcher.dhall
 
 let InhibitRule =
       { Type =

diff --git a/v1/OpsGenieConfig.dhall b/v1/OpsGenieConfig.dhall
@@ -1,14 +1,24 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let BasicAuth = ./BasicAuth.dhall
+let BasicAuth =
+        ./BasicAuth.dhall sha256:2ce5199f94352d1293242b1e97ab6bad6c29f34d8df163676c4487e3c5dae3af
+      ? ./BasicAuth.dhall
 
-let HTTPConfig = ./HTTPConfig.dhall
+let HTTPConfig =
+        ./HTTPConfig.dhall sha256:b33237d271ba53c43ad70ee79463355d929ee65040d413c0f15ef3e3071af17f
+      ? ./HTTPConfig.dhall
 
-let OpsGenieConfigDetail = ./OpsGenieConfigDetail.dhall
+let OpsGenieConfigDetail =
+        ./OpsGenieConfigDetail.dhall sha256:9bb842a44771c837f8f1d7a39c837ff7821ff436f4b198bdfcce0a681dc08b2e
+      ? ./OpsGenieConfigDetail.dhall
 
-let OpsGenieConfigResponder = ./OpsGenieConfigResponder.dhall
+let OpsGenieConfigResponder =
+        ./OpsGenieConfigResponder.dhall sha256:49d9e33fa13b200230a0f65b12ff4fcbe5675b4cf5dbaf9b64d9797899300587
+      ? ./OpsGenieConfigResponder.dhall
 
 let OpsGenieConfig =
       { Type =

diff --git a/v1/PagerDutyConfig.dhall b/v1/PagerDutyConfig.dhall
@@ -1,10 +1,16 @@
-let imports = ../imports.dhall
+let imports =
+        ../imports.dhall sha256:e0de9b6a50d2dacac246762b205b7e0d2f279d6410d37a8c0602dfa167410b99
+      ? ../imports.dhall
 
 let Kubernetes = imports.Kubernetes
 
-let HTTPConfig = ./HTTPConfig.dhall
+let HTTPConfig =
+        ./HTTPConfig.dhall sha256:b33237d271ba53c43ad70ee79463355d929ee65040d413c0f15ef3e3071af17f
+      ? ./HTTPConfig.dhall
 
-let PagerDutyConfigDetail = ./PagerDutyConfigDetail.dhall
+let PagerDutyConfigDetail =
+        ./PagerDutyConfigDetail.dhall sha256:9bb842a44771c837f8f1d7a39c837ff7821ff436f4b198bdfcce0a681dc08b2e
+      ? ./PagerDutyConfigDetail.dhall
 
 let PagerDutyConfig =
       { Type =