From a8e779a68cc048d6d82b160e8e899cfab84db309 Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Sun, 15 May 2022 22:22:06 +0900
Subject: [PATCH] Power up (#8684)

---
 Dockerfile                      |  3 ++-
 chart/{Chart.yaml => Chart.yml} |  0
 chart/files/default.yml         | 11 +++++------
 chart/templates/ConfigMap.yml   |  5 +++--
 chart/templates/Deployment.yml  | 11 +++++++----
 chart/values.yml                |  3 +++
 okteto-pipeline.yml             |  3 ---
 okteto.yml                      |  6 ++++++
 8 files changed, 26 insertions(+), 16 deletions(-)
 rename chart/{Chart.yaml => Chart.yml} (100%)
 create mode 100644 chart/values.yml
 delete mode 100644 okteto-pipeline.yml
 create mode 100644 okteto.yml

diff --git a/Dockerfile b/Dockerfile
index 174e2e9bc7..33d5faad12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:18.0.0-alpine3.15 AS base
 
-ENV NODE_ENV=production
+ARG NODE_ENV=production
 
 WORKDIR /misskey
 
@@ -31,5 +31,6 @@ COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
 COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
 COPY . ./
 
+ENV NODE_ENV=production
 CMD ["npm", "run", "migrateandstart"]
 
diff --git a/chart/Chart.yaml b/chart/Chart.yml
similarity index 100%
rename from chart/Chart.yaml
rename to chart/Chart.yml
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 276e9f8915..a9ef22f424 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -6,7 +6,7 @@
 #───┘ URL └─────────────────────────────────────────────────────
 
 # Final accessible URL seen by a user.
-url: https://example.tld/
+# url: https://example.tld/
 
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # URL SETTINGS AFTER THAT!
@@ -41,7 +41,7 @@ url: https://example.tld/
 #   You need to set Certificate in 'https' section.
 
 # To use option 1, uncomment below line.
-port: 3000    # A port that your Misskey server should listen.
+port: 3000 # A port that your Misskey server should listen.
 
 # To use option 2, uncomment below lines.
 #port: 443
@@ -89,8 +89,8 @@ redis:
 #  host: localhost
 #  port: 9200
 #  ssl: false
-#  user: 
-#  pass: 
+#  user:
+#  pass:
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -108,8 +108,7 @@ redis:
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # ID SETTINGS AFTER THAT!
 
-id: 'aid'
-
+id: "aid"
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
 
diff --git a/chart/templates/ConfigMap.yml b/chart/templates/ConfigMap.yml
index 51a9c256ce..37c25e0864 100644
--- a/chart/templates/ConfigMap.yml
+++ b/chart/templates/ConfigMap.yml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "misskey.fullname" . }}-config-file
+  name: {{ include "misskey.fullname" . }}-configuration
 data:
   default.yml: |-
-{{ .Files.Get "files/default.yml"|indent 4 }}
+    {{ .Files.Get "files/default.yml"|nindent 4 }}
+    url: {{ .Values.url }}
diff --git a/chart/templates/Deployment.yml b/chart/templates/Deployment.yml
index 8ead4d7a9c..d16aece915 100644
--- a/chart/templates/Deployment.yml
+++ b/chart/templates/Deployment.yml
@@ -16,9 +16,12 @@ spec:
     spec:
       containers:
         - name: misskey
-          image: okteto.dev/misskey:latest
+          image: {{ .Values.image }}
+          env:
+            - name: NODE_ENV
+              value: {{ .Values.environment }}
           volumeMounts:
-            - name: config-file
+            - name: {{ include "misskey.fullname" . }}-configuration
               mountPath: /misskey/.config
               readOnly: true
           ports:
@@ -39,6 +42,6 @@ spec:
           ports:
             - containerPort: 6379
       volumes:
-        - name: config-file
+        - name: {{ include "misskey.fullname" . }}-configuration
           configMap:
-            name: {{ include "misskey.fullname" . }}-config-file
+            name: {{ include "misskey.fullname" . }}-configuration
diff --git a/chart/values.yml b/chart/values.yml
new file mode 100644
index 0000000000..a7031538a9
--- /dev/null
+++ b/chart/values.yml
@@ -0,0 +1,3 @@
+url: https://example.tld/
+image: okteto.dev/misskey
+environment: production
diff --git a/okteto-pipeline.yml b/okteto-pipeline.yml
deleted file mode 100644
index 0dc8059034..0000000000
--- a/okteto-pipeline.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-deploy:
-  - okteto build -t okteto.dev/misskey:latest
-  - helm upgrade --install misskey chart
diff --git a/okteto.yml b/okteto.yml
new file mode 100644
index 0000000000..e2996fbbc9
--- /dev/null
+++ b/okteto.yml
@@ -0,0 +1,6 @@
+build:
+  misskey:
+    args:
+      - NODE_ENV=development
+deploy:
+  - helm upgrade --install misskey chart --set image=${OKTETO_BUILD_MISSKEY_IMAGE} --set url="https://misskey-$(kubectl config view --minify -o jsonpath='{..namespace}').cloud.okteto.net" --set environment=development