upgrade growi 7

GiganticMinecraft · Mar 28, 2024 · b54b6b6 · b54b6b6
1 parent 523c230
commit b54b6b6
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 241 deletions.
diff --git a/.github/workflows/build_growi_hackmd.yaml b/.github/workflows/build_growi_hackmd.yaml
diff --git a/docker-images/growi/hackmd/Dockerfile b/docker-images/growi/hackmd/Dockerfile
diff --git a/docker-images/growi/hackmd/apply-growi-agent.sh b/docker-images/growi/hackmd/apply-growi-agent.sh
diff --git a/docker-images/growi/hackmd/config.json b/docker-images/growi/hackmd/config.json
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/http-exits.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/cloudflared-tunnel-exits/http-exits.yaml
@@ -100,11 +100,6 @@ spec:
             external-hostname: wiki.onp-k8s.admin.seichi.click
             internal-authority: "growi.growi-system:3000"
 
-          # HackMD for Growi
-          - name: hackmd
-            external-hostname: hackmd.onp-k8s.admin.seichi.click
-            internal-authority: "hackmd.growi-system:3000"
-
   template:
     metadata:
       name: "cloudflared-tunnel-http-exit--{{name}}"

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/growi/deployment.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/growi/deployment.yaml
@@ -14,13 +14,13 @@ spec:
     spec:
       containers:
         - name: growi
-          image: weseek/growi:6
+          image: weseek/growi:7
           resources:
             requests:
-              cpu: 1
+              cpu: "1"
               memory: 1Gi
             limits:
-              cpu: 1
+              cpu: "1"
               memory: 1Gi
           env:
             - name: APP_SITE_URL
@@ -35,10 +35,6 @@ spec:
               value: "mongodb"
             - name: MATHJAX
               value: "1"
-            - name: HACKMD_URI
-              value: "https://hackmd.onp-k8s.admin.seichi.click"
-            - name: HACKMD_URI_FOR_SERVER
-              value: "http://hackmd:3000"
             - name: PASSWORD_SEED
               valueFrom:
                 secretKeyRef:

diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/deployment.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/deployment.yaml
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/mariadb.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/mariadb.yaml
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/service.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/growi-system/hackmd/service.yaml