From 99d59fd1e68247b76bd4cd896d0e138c340b1eb6 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Fri, 31 Jan 2020 20:16:03 +0000
Subject: [PATCH] k8s: fix

---
 k8s/http/deployment.dhall | 18 ++++++++++--------
 k8s/http/ingress.dhall    | 10 +++++-----
 k8s/http/service.dhall    | 18 +++++++++---------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/k8s/http/deployment.dhall b/k8s/http/deployment.dhall
index c0fb555..8071f9a 100644
--- a/k8s/http/deployment.dhall
+++ b/k8s/http/deployment.dhall
@@ -14,12 +14,14 @@ let podSpec
       → let rootContainer =
               [ kubernetes.Container::{
                 , name = "web"
-                , env = config.envVars
+                , env = Some config.envVars
                 , image = Some config.image
                 , imagePullPolicy = Some "Always"
-                , ports =
-                  [ kubernetes.ContainerPort::{ containerPort = config.appPort }
-                  ]
+                , ports = Some
+                    [ kubernetes.ContainerPort::{
+                      , containerPort = config.appPort
+                      }
+                    ]
                 }
               ]
 
@@ -29,21 +31,21 @@ let podSpec
 
         in  kubernetes.PodSpec::{
             , containers = combined
-            , imagePullSecrets =
-              [ kubernetes.LocalObjectReference::{ name = Some "regcred" } ]
+            , imagePullSecrets = Some
+                [ kubernetes.LocalObjectReference::{ name = Some "regcred" } ]
             }
 
 let spec =
         λ(config : Config.Type)
       → kubernetes.DeploymentSpec::{
         , selector = kubernetes.LabelSelector::{
-          , matchLabels = selector config.name
+          , matchLabels = Some (selector config.name)
           }
         , replicas = Some config.replicas
         , template = kubernetes.PodTemplateSpec::{
           , metadata = kubernetes.ObjectMeta::{
             , name = config.name
-            , labels = selector config.name
+            , labels = Some (selector config.name)
             }
           , spec = Some (podSpec config)
           }
diff --git a/k8s/http/ingress.dhall b/k8s/http/ingress.dhall
index 6ad748f..d1572cf 100644
--- a/k8s/http/ingress.dhall
+++ b/k8s/http/ingress.dhall
@@ -20,8 +20,8 @@ let metadata
     =   λ(config : Config.Type)
       → kubernetes.ObjectMeta::{
         , name = config.name
-        , labels = [ kv "app" config.name ]
-        , annotations = annotations config
+        , labels = Some [ kv "app" config.name ]
+        , annotations = Some (annotations config)
         , namespace = Some "apps"
         }
 
@@ -29,7 +29,7 @@ let tls
     : Config.Type → kubernetes.IngressTLS.Type
     =   λ(config : Config.Type)
       → kubernetes.IngressTLS::{
-        , hosts = [ config.domain ]
+        , hosts = Some [ config.domain ]
         , secretName = Some "${config.leIssuer}-certs-${config.name}"
         }
 
@@ -56,8 +56,8 @@ let ingress
       → kubernetes.Ingress::{
         , metadata = metadata config
         , spec = Some kubernetes.IngressSpec::{
-          , tls = [ tls config ]
-          , rules = [ rule config ]
+          , tls = Some [ tls config ]
+          , rules = Some [ rule config ]
           }
         }
 
diff --git a/k8s/http/service.dhall b/k8s/http/service.dhall
index e120277..3acf459 100644
--- a/k8s/http/service.dhall
+++ b/k8s/http/service.dhall
@@ -20,14 +20,14 @@ let spec
     : Config.Type → kubernetes.ServiceSpec.Type
     =   λ(config : Config.Type)
       → kubernetes.ServiceSpec::{
-        , selector = selector config.name
+        , selector = Some (selector config.name)
         , type = Some "ClusterIP"
-        , ports =
-          [ kubernetes.ServicePort::{
-            , targetPort = Some (kubernetes.IntOrString.Int config.appPort)
-            , port = config.appPort
-            }
-          ]
+        , ports = Some
+            [ kubernetes.ServicePort::{
+              , targetPort = Some (kubernetes.IntOrString.Int config.appPort)
+              , port = config.appPort
+              }
+            ]
         }
 
 let service
@@ -37,8 +37,8 @@ let service
         , metadata = kubernetes.ObjectMeta::{
           , namespace = Some "apps"
           , name = config.name
-          , labels = [ kv "app" config.name ]
-          , annotations = annotations config
+          , labels = Some [ kv "app" config.name ]
+          , annotations = Some (annotations config)
           }
         , spec = Some (spec config)
         }