This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git
The following commit(s) were added to refs/heads/main by this push:
new 51cd15d remove datasource sidecar and mysql datasource because
datasource.yaml has been added into the image (#168)
51cd15d is described below
commit 51cd15dd01c09f4797cc66d00b24c64d89ec9d1b
Author: ZhangNing10 <[email protected]>
AuthorDate: Mon Jul 24 16:13:14 2023 +0800
remove datasource sidecar and mysql datasource because datasource.yaml has
been added into the image (#168)
* remove datasource sidecar and mysql because datasource.yaml has been
added into the image
* remove configmap checksum
---
charts/devlake/templates/configmaps.yaml | 39 -------------------------------
charts/devlake/templates/deployments.yaml | 3 ---
charts/devlake/values.yaml | 5 ----
3 files changed, 47 deletions(-)
diff --git a/charts/devlake/templates/configmaps.yaml
b/charts/devlake/templates/configmaps.yaml
deleted file mode 100644
index 10cffb0..0000000
--- a/charts/devlake/templates/configmaps.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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.
-#
----
-{{- if .Values.grafana.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "devlake.fullname" . }}-grafana-datasource
- labels:
- {{ $.Values.grafana.sidecar.datasources.label }}: {{
$.Values.grafana.sidecar.datasources.labelValue | quote }}
-data:
-{{- if eq .Values.option.database "mysql" }}
- grafana-datasource.yml: |
- apiVersion: 1
- datasources:
- - name: mysql
- type: mysql
- url: $MYSQL_URL
- database: $MYSQL_DATABASE
- user: $MYSQL_USER
- secureJsonData:
- password: $MYSQL_PASSWORD
- editable: false
-{{- end }}
-{{- end }}
diff --git a/charts/devlake/templates/deployments.yaml
b/charts/devlake/templates/deployments.yaml
index 5fb752c..4bc7aed 100644
--- a/charts/devlake/templates/deployments.yaml
+++ b/charts/devlake/templates/deployments.yaml
@@ -112,9 +112,6 @@ spec:
{{- with .Values.lake.extraLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
- annotations:
- # Force reload on config changes
- checksum/devlake-config: {{ include (print $.Template.BasePath
"/configmaps.yaml") . | sha256sum }}
spec:
{{- with .Values.lake.securityContext }}
securityContext:
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index 3586781..3f3c996 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -138,11 +138,6 @@ grafana:
grafana.ini:
server:
root_url: "%(protocol)s://%(domain)s/grafana"
- sidecar:
- datasources:
- enabled: true
- label: grafana_datasource
- labelValue: "1"
#the secret name should be as same as .Values.option.connectionSecretName
envFromSecrets:
- name: "devlake-mysql-auth"
