From 07c11885bb0ebe7a30a57759ae1d3a0e257fa506 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@twitter.com>
Date: Sun, 2 Oct 2022 20:02:03 -0700
Subject: [PATCH 1/2] Ensure k8s Service is created for finagle-server
 deployment to fix k8s DNS

---
 docker/docker-compose.yml                 |  2 ++
 kubernetes/finagle-client-deployment.yaml |  1 +
 kubernetes/finagle-server-deployment.yaml |  3 +++
 kubernetes/finagle-server-service.yaml    | 20 ++++++++++++++++++++
 kustomization.yaml                        |  8 ++++++++
 5 files changed, 34 insertions(+)
 create mode 100644 kubernetes/finagle-server-service.yaml
 create mode 100644 kustomization.yaml

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c41d0ec..cb243dc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,3 +7,5 @@ services:
     command: client/run
   finagle-server:
     build: ../finagle-helloworld
+    ports:
+      - 9992:9992
diff --git a/kubernetes/finagle-client-deployment.yaml b/kubernetes/finagle-client-deployment.yaml
index ce0e273..c3587bb 100644
--- a/kubernetes/finagle-client-deployment.yaml
+++ b/kubernetes/finagle-client-deployment.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     io.kompose.service: finagle-client
   name: finagle-client
+  namespace: px-finagle
 spec:
   replicas: 1
   selector:
diff --git a/kubernetes/finagle-server-deployment.yaml b/kubernetes/finagle-server-deployment.yaml
index 7ff945d..4156792 100644
--- a/kubernetes/finagle-server-deployment.yaml
+++ b/kubernetes/finagle-server-deployment.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     io.kompose.service: finagle-server
   name: finagle-server
+  namespace: px-finagle
 spec:
   replicas: 1
   selector:
@@ -26,6 +27,8 @@ spec:
       containers:
         - image: finagle-server
           name: finagle-server
+          ports:
+            - containerPort: 9992
           resources: {}
       restartPolicy: Always
 status: {}
diff --git a/kubernetes/finagle-server-service.yaml b/kubernetes/finagle-server-service.yaml
new file mode 100644
index 0000000..907c558
--- /dev/null
+++ b/kubernetes/finagle-server-service.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert -f ../docker/docker-compose.yml
+    kompose.version: 1.26.1 (a9d05d509)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: finagle-server
+  name: finagle-server
+  namespace: px-finagle
+spec:
+  ports:
+    - name: "9992"
+      port: 9992
+      targetPort: 9992
+  selector:
+    io.kompose.service: finagle-server
+status:
+  loadBalancer: {}
diff --git a/kustomization.yaml b/kustomization.yaml
new file mode 100644
index 0000000..49ae3eb
--- /dev/null
+++ b/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - kubernetes/namespace.yaml
+  - kubernetes/finagle-client-deployment.yaml
+  - kubernetes/finagle-server-deployment.yaml
+  - kubernetes/finagle-server-service.yaml

From a12c6bb9de4992b305ed252f1c2b14592a5c690e Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@twitter.com>
Date: Sun, 2 Oct 2022 20:02:15 -0700
Subject: [PATCH 2/2] Update README

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 37a6ea7..f071159 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,8 @@
 ```bash
 docker-compose -f docker/docker-compose.yml run finagle-client
 ```
-* The kubernetes manifests are created through kustomize by converting the docker-compose file
+* The kubernetes manifests are created through kustomize by converting the docker-compose file. This will remove the `px-finagle` namespace, which must be updated manually.
 ```bash
-cd docker
-kompose convert
-mv *.yaml ../kubernetes
+cd kubernetes
+kompose convert -f ../docker/docker-compose.yml
 ```