From 48d674a45c08d9f2749c9a1cee698b01ed582301 Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon@intuitiveexplanations.com>
Date: Tue, 20 Dec 2022 22:48:03 -0700
Subject: [PATCH] Spin up Docker registry properly, I think

---
 k8s/riju-docker-registry.yaml |  2 ++
 k8s/riju-server.yaml          | 10 +++-------
 k8s/secrets.in.yaml           | 19 +++++++++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/k8s/riju-docker-registry.yaml b/k8s/riju-docker-registry.yaml
index e99fd08..4e3df08 100644
--- a/k8s/riju-docker-registry.yaml
+++ b/k8s/riju-docker-registry.yaml
@@ -56,9 +56,11 @@ metadata:
 spec:
   selector:
     app: docker-registry
+  type: NodePort
   ports:
     - name: api
       port: 80
+      nodePort: 30999
       targetPort: 5000
 
 ---
diff --git a/k8s/riju-server.yaml b/k8s/riju-server.yaml
index 0fa545b..150fa83 100644
--- a/k8s/riju-server.yaml
+++ b/k8s/riju-server.yaml
@@ -21,16 +21,12 @@ spec:
         - name: docker
           hostPath:
             path: /var/run/docker.sock
+      imagePullSecrets:
+        - name: registry-login
       containers:
         - name: server
           image: "localhost:30999/riju:app"
-          resources:
-            requests:
-              cpu: "1000m"
-              memory: "6Gi"
-            limits:
-              cpu: "1000m"
-              memory: "6Gi"
+          resources: {}
           ports:
             - name: http
               containerPort: 6119
diff --git a/k8s/secrets.in.yaml b/k8s/secrets.in.yaml
index 9ca53a3..65118e8 100644
--- a/k8s/secrets.in.yaml
+++ b/k8s/secrets.in.yaml
@@ -15,3 +15,22 @@ metadata:
   name: registry-auth
 data:
   htpasswd: "{{ .registry.htpasswd | println | b64enc }}"
+
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  namespace: riju
+  name: registry-login
+type: kubernetes.io/dockerconfigjson
+stringData:
+  .dockerconfigjson: |
+    {
+      "auths": {
+        "localhost:30999": {
+          "username": "admin",
+          "password": "{{ .registry.password }}",
+          "auth": "{{ .registry.password | printf "admin:%s" | b64enc }}"
+        }
+      }
+    }