From e0f7f9b0cec9459b076de2f6eb6a53dbcf758831 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon@intuitiveexplanations.com>
Date: Tue, 20 Dec 2022 22:29:58 -0700
Subject: [PATCH] Move things around

---
 k8s/ingresses.in.yaml                        | 16 -----
 k8s/{riju.yaml => riju-docker-registry.yaml} | 66 ++++----------------
 k8s/riju-server.yaml                         | 56 +++++++++++++++++
 3 files changed, 68 insertions(+), 70 deletions(-)
 delete mode 100644 k8s/ingresses.in.yaml
 rename k8s/{riju.yaml => riju-docker-registry.yaml} (55%)
 create mode 100644 k8s/riju-server.yaml

diff --git a/k8s/ingresses.in.yaml b/k8s/ingresses.in.yaml
deleted file mode 100644
index aecc7ea..0000000
--- a/k8s/ingresses.in.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-kind: IngressRoute
-apiVersion: traefik.containo.us/v1alpha1
-metadata:
-  namespace: riju
-  name: docker-registry
-spec:
-  entryPoints:
-    - docker
-  routes:
-    - kind: Rule
-      match: "PathPrefix(`/`)"
-      services:
-        - namespace: riju
-          name: docker-registry
-          port: 80
diff --git a/k8s/riju.yaml b/k8s/riju-docker-registry.yaml
similarity index 55%
rename from k8s/riju.yaml
rename to k8s/riju-docker-registry.yaml
index 66d97a4..e99fd08 100644
--- a/k8s/riju.yaml
+++ b/k8s/riju-docker-registry.yaml
@@ -54,68 +54,26 @@ metadata:
   namespace: riju
   name: docker-registry
 spec:
-  type: NodePort
   selector:
     app: docker-registry
   ports:
     - name: api
       port: 80
-      nodePort: 30999
       targetPort: 5000
 
 ---
-kind: Deployment
-apiVersion: apps/v1
+kind: IngressRoute
+apiVersion: traefik.containo.us/v1alpha1
 metadata:
   namespace: riju
-  name: riju-server
+  name: docker-registry
 spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: riju-server
-  template:
-    metadata:
-      labels:
-        app: riju-server
-    spec:
-      volumes:
-        - name: cache
-          hostPath:
-            path: /var/cache/riju
-        - name: docker
-          hostPath:
-            path: /var/run/docker.sock
-      containers:
-        - name: server
-          image: "localhost:30999/riju:app"
-          resources:
-            requests:
-              cpu: "1000m"
-              memory: "6Gi"
-            limits:
-              cpu: "1000m"
-              memory: "6Gi"
-          ports:
-            - name: http
-              containerPort: 6119
-          volumeMounts:
-            - name: cache
-              mountPath: /var/cache/riju
-            - name: docker
-              mountPath: /var/run/docker.sock
-              readOnly: true
-
----
-kind: Service
-apiVersion: v1
-metadata:
-  namespace: riju
-  name: riju-server
-spec:
-  selector:
-    app: riju-server
-  ports:
-    - name: http
-      port: 80
-      targetPort: 6119
+  entryPoints:
+    - docker
+  routes:
+    - kind: Rule
+      match: "PathPrefix(`/`)"
+      services:
+        - namespace: riju
+          name: docker-registry
+          port: 80
diff --git a/k8s/riju-server.yaml b/k8s/riju-server.yaml
new file mode 100644
index 0000000..0fa545b
--- /dev/null
+++ b/k8s/riju-server.yaml
@@ -0,0 +1,56 @@
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  namespace: riju
+  name: riju-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: riju-server
+  template:
+    metadata:
+      labels:
+        app: riju-server
+    spec:
+      volumes:
+        - name: cache
+          hostPath:
+            path: /var/cache/riju
+        - name: docker
+          hostPath:
+            path: /var/run/docker.sock
+      containers:
+        - name: server
+          image: "localhost:30999/riju:app"
+          resources:
+            requests:
+              cpu: "1000m"
+              memory: "6Gi"
+            limits:
+              cpu: "1000m"
+              memory: "6Gi"
+          ports:
+            - name: http
+              containerPort: 6119
+          volumeMounts:
+            - name: cache
+              mountPath: /var/cache/riju
+            - name: docker
+              mountPath: /var/run/docker.sock
+              readOnly: true
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+  namespace: riju
+  name: riju-server
+spec:
+  selector:
+    app: riju-server
+  ports:
+    - name: http
+      port: 80
+      targetPort: 6119