From 2a5e6fcde370b6d6a88173664152405e28b671d6 Mon Sep 17 00:00:00 2001
From: Robert Prehn <3952444+prehnRA@users.noreply.github.com>
Date: Sat, 16 Jan 2021 13:27:07 -0600
Subject: [PATCH] fix: Repair merge issues in generate-kube

---
 infrastructure/kube.yaml | 41 +++++++++++++++++++++++++++++++++++++++-
 script/generate-kube     |  2 +-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/infrastructure/kube.yaml b/infrastructure/kube.yaml
index a181dbe4..483eeecf 100644
--- a/infrastructure/kube.yaml
+++ b/infrastructure/kube.yaml
@@ -1,7 +1,13 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: legendary
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: legendary
+  namespace: legendary
 spec:
   replicas: 2
   selector:
@@ -14,7 +20,7 @@ spec:
     spec:
       containers:
         - name: app
-          image: registry.gitlab.com/mythic-insight/legendary:1.2.1
+          image: registry.gitlab.com/mythic-insight/legendary:1.2.3
           ports:
             - containerPort: 4000
           env:
@@ -28,3 +34,36 @@ spec:
                 secretKeyRef:
                   name: legendary
                   key: secret-key-base
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: legendary
+  namespace: legendary
+spec:
+  selector:
+    app: legendary
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 4000
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: legendary
+  namespace: legendary
+  annotations:
+    kubernetes.io/ingress.class: nginx
+spec:
+  rules:
+  - host: legendary-demo.mythicinsight.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: legendary
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
diff --git a/script/generate-kube b/script/generate-kube
index 2896886c..9094d129 100755
--- a/script/generate-kube
+++ b/script/generate-kube
@@ -11,4 +11,4 @@ var packageConfig = JSON.parse(packageText);
 
 const {version} = packageConfig;
 
-fs.writeFileSync("infrastructure/kube.yaml", manifestText);
+fs.writeFileSync("infrastructure/kube.yaml", dots.kube({version: version}));