This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 97e77133 docs: refactored deployment files to include default
loggingDir (#2844)
97e77133 is described below
commit 97e7713385c620353207ade64e821ef4c14c0834
Author: Keon Amini <[email protected]>
AuthorDate: Thu Aug 25 21:08:50 2022 -0500
docs: refactored deployment files to include default loggingDir (#2844)
---
deployment/helm/templates/configmaps.yaml | 31 +++++++++++-----------
deployment/helm/values.yaml | 2 ++
k8s-deploy.yaml => deployment/k8s/k8s-deploy.yaml | 2 +-
.../temporal/docker-compose-temporal.yml | 20 +++++++-------
4 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/deployment/helm/templates/configmaps.yaml
b/deployment/helm/templates/configmaps.yaml
index 9ba2dfb9..a445dc75 100644
--- a/deployment/helm/templates/configmaps.yaml
+++ b/deployment/helm/templates/configmaps.yaml
@@ -1,19 +1,19 @@
#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You under the Apache License, Version 2.0
+ # (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
---
apiVersion: v1
kind: ConfigMap
@@ -24,4 +24,5 @@ data:
MYSQL_PASSWORD: "{{ .Values.mysql.password }}"
MYSQL_DATABASE: "{{ .Values.mysql.database }}"
MYSQL_ROOT_PASSWORD: "{{ .Values.mysql.rootPassword }}"
+ LOGGING_DIR: "{{ .Values.lake.loggingDir }}"
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
index 70d94e1d..9cc77f5a 100644
--- a/deployment/helm/values.yaml
+++ b/deployment/helm/values.yaml
@@ -102,6 +102,8 @@ lake:
affinity: {}
+ loggingDir: "/app/logs"
+
ui:
image:
repository: apache/devlake-config-ui
diff --git a/k8s-deploy.yaml b/deployment/k8s/k8s-deploy.yaml
similarity index 99%
rename from k8s-deploy.yaml
rename to deployment/k8s/k8s-deploy.yaml
index e7dbfac8..57f62629 100644
--- a/k8s-deploy.yaml
+++ b/deployment/k8s/k8s-deploy.yaml
@@ -39,6 +39,7 @@ data:
GRAFANA_ENDPOINT: grafana.devlake.svc.cluster.local:3000
# ADMIN_USER: devlake
# ADMIN_PASS: merico
+ LOGGING_DIR: /app/logs
---
apiVersion: apps/v1
kind: Deployment
@@ -157,7 +158,6 @@ spec:
envFrom:
- configMapRef:
name: devlake-config
- env:
---
apiVersion: v1
kind: Service
diff --git a/docker-compose-temporal.yml
b/deployment/temporal/docker-compose-temporal.yml
similarity index 91%
rename from docker-compose-temporal.yml
rename to deployment/temporal/docker-compose-temporal.yml
index fa3030d9..d8cc673c 100644
--- a/docker-compose-temporal.yml
+++ b/deployment/temporal/docker-compose-temporal.yml
@@ -21,7 +21,7 @@ services:
- mysql-storage:/var/lib/mysql
restart: always
ports:
- - 127.0.0.1:3306:3306
+ - "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: admin
MYSQL_DATABASE: lake
@@ -31,9 +31,9 @@ services:
grafana:
image: mericodev/devlake-dashboard:latest
build:
- context: grafana/
+ context: ../../grafana
ports:
- - 3002:3000
+ - "3002:3000"
volumes:
- grafana-storage:/var/lib/grafana
environment:
@@ -51,12 +51,12 @@ services:
devlake:
image: mericodev/devlake:latest
build:
- context: "."
+ context: "../.."
args:
HTTPS_PROXY: "${HTTPS_PROXY}"
GOPROXY: "${GOPROXY}"
ports:
- - 127.0.0.1:8080:8080
+ - "8080:8080"
restart: always
volumes:
- ./.env:/app/.env
@@ -71,13 +71,13 @@ services:
devlake-worker:
image: mericodev/devlake:latest
build:
- context: "."
+ context: "../.."
args:
HTTPS_PROXY: "${HTTPS_PROXY}"
GOPROXY: "${GOPROXY}"
restart: always
volumes:
- - ./.env:/app/.env
+ - ../../.env:/app/.env
depends_on:
- mysql
command: lake-worker
@@ -90,11 +90,11 @@ services:
config-ui:
image: mericodev/devlake-config-ui:latest
build:
- context: "config-ui"
+ context: "../../config-ui"
ports:
- - 127.0.0.1:4000:80
+ - "4000:80"
env_file:
- - ./.env
+ - ../../.env
environment:
DEVLAKE_ENDPOINT: devlake:8080
GRAFANA_ENDPOINT: http://localhost:3002
