From 35851e2053d1e35bbf741c8c163f4d233e12eac1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 10 Jan 2019 16:46:46 +0000 Subject: [PATCH] Set APP_NAME for gitea Change the app name from gitea to opendev. Also, add a tagline because why not? And add two missing settings. And fix the pandoc command for RST rendering. And fix the gitea URL. Keep one copy of old replicasets. Keep 4 replicas. Add a dummp env variable to trigger deployments. Change-Id: I0182d18a838d444d5853238fa2e48b4511383a94 --- kubernetes/gitea/app.ini.j2 | 8 ++++++-- kubernetes/gitea/k8s/deployment.yaml | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/kubernetes/gitea/app.ini.j2 b/kubernetes/gitea/app.ini.j2 index c1731332da..79ec762f86 100644 --- a/kubernetes/gitea/app.ini.j2 +++ b/kubernetes/gitea/app.ini.j2 @@ -1,8 +1,12 @@ +APP_NAME = OpenDev: Free Software Needs Free Tools +RUN_MODE = prod +RUN_USER = git + [server] APP_DATA_PATH = /data/gitea SSH_DOMAIN = localhost HTTP_PORT = 3000 -ROOT_URL = http://38.108.68.96/ +ROOT_URL = http://38.108.68.64/ DISABLE_SSH = false SSH_PORT = 22 LFS_CONTENT_PATH = /data/git/lfs @@ -69,6 +73,6 @@ ENABLED = true ; List of file extensions that should be rendered by an external command FILE_EXTENSIONS = .rst ; External command to render all matching extensions -RENDER_COMMAND = "/usr/bin/pandoc" +RENDER_COMMAND = "/usr/bin/pandoc -f rst" ; Input is not a standard input but a file IS_INPUT_FILE = false diff --git a/kubernetes/gitea/k8s/deployment.yaml b/kubernetes/gitea/k8s/deployment.yaml index fd982191a6..9d84148f00 100644 --- a/kubernetes/gitea/k8s/deployment.yaml +++ b/kubernetes/gitea/k8s/deployment.yaml @@ -6,7 +6,8 @@ metadata: labels: app: gitea spec: - replicas: 1 + revisionHistoryLimit: 1 + replicas: 4 selector: matchLabels: app: gitea @@ -28,6 +29,9 @@ spec: containers: - name: gitea image: opendevorg/gitea + env: + - name: deployment_id + value: '1' # Increment to trigger a deployment. ports: - containerPort: 3000 volumeMounts: