This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new de1efd8fa update helm charts linkis config (#4244)
de1efd8fa is described below
commit de1efd8fa215418b356878cbbe489573445c005e
Author: legendtkl <[email protected]>
AuthorDate: Wed Feb 22 20:19:22 2023 +0800
update helm charts linkis config (#4244)
---
.../linkis/templates/configmap-linkis-config.yaml | 42 +++-
.../linkis/templates/linkis-cg-engineplugin.yaml | 223 ---------------------
2 files changed, 34 insertions(+), 231 deletions(-)
diff --git
a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
index 9775d9159..054e6c4d4 100644
--- a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
+++ b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
@@ -128,7 +128,9 @@ data:
enable-self-preservation: false
eviction-interval-timer-in-ms: 3000
server:
- response-cache-update-interval-ms: 2000
+ enable-self-preservation: false
+ eviction-interval-timer-in-ms: 5000
+ response-cache-update-interval-ms: 3000
linkis-cli.properties: |
#wds.linkis.client.common.creator=LINKISCLI
@@ -153,6 +155,10 @@ data:
wds.linkis.server.mybatis.datasource.password={{
.Values.linkis.datasource.password }}
# mysql
wds.linkis.mysql.is.encrypt=false
+ linkis.mysql.strong.security.enable=false
+
linkis.mysql.force.params=allowLoadLocalInfile=false&autoDeserialize=false&allowLocalInfile=false&allowUrlInLocalInfile=false
+
linkis.mysql.sensitive.params=allowLoadLocalInfile,autoDeserialize,allowLocalInfile,allowUrlInLocalInfile,#
+
#hadoop/hive/spark config
hadoop.config.dir=/etc/hadoop-conf
hive.config.dir=/etc/hive-conf
@@ -197,7 +203,7 @@ data:
wds.linkis.gateway.conf.url.pass.auth=/dss/
wds.linkis.gateway.conf.enable.token.auth=true
wds.linkis.is.gateway=true
-
wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/instance/label/dao/impl/*.xml,classpath*:org/apache/linkis/gateway/authentication/dao/impl/*.xml
+
wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.instance.label.entity
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.instance.label.dao,org.apache.linkis.gateway.authentication.dao
wds.linkis.label.entity.packages=org.apache.linkis.gateway.ujes.route.label
@@ -210,14 +216,24 @@ data:
wds.linkis.admin.password=4f90c1b13
##Spring
spring.server.port={{ .Values.mgGateway.port }}
+ ## you may set service version if you want to distinguish different
configuration version
+ spring.eureka.instance.metadata-map.linkis.conf.version=v1
linkis-cg-linkismanager.properties: |
##restful
wds.linkis.server.restful.scan.packages=org.apache.linkis.manager.am.restful,org.apache.linkis.resourcemanager.restful
##mybatis
-
wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/manager/dao/impl/*.xml,org/apache/linkis/manager/rm/external/dao/impl/ExternalResourceProviderDaoImpl.xml
+
wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
wds.linkis.server.mybatis.typeAliasesPackage=
-
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao
+
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.engineplugin.server.dao
+
+ wds.linkis.engineConn.plugin.cache.expire-in-seconds=100000
+ wds.linkis.engineConn.dist.load.enable=true
+
#wds.linkis.engineconn.home=/appcom/Install/LinkisInstall/lib/linkis-engineconn-plugins
+
#wds.linkis.engineconn.plugin.loader.store.path=/appcom/Install/LinkisInstall/lib/linkis-engineconn-plugins
+
+ ## you may set service version if you want to distinguish different
configuration version
+ spring.eureka.instance.metadata-map.linkis.conf.version=v1
##Spring
spring.server.port={{ .Values.cgLinkisManager.port }}
@@ -233,6 +249,8 @@ data:
##set engine environment in econn start script, such as SPARK3_HOME,the
value of env will read from ecm host by key.
#wds.linkis.engineconn.env.keys=SPARK3_HOME,
+ spring.eureka.instance.metadata-map.linkis.conf.version=v1
+
linkis-cg-engineplugin.properties: |
wds.linkis.test.mode={{ .Values.linkis.featureGates.testMode }}
@@ -265,16 +283,21 @@ data:
##Spring
spring.server.port={{ .Values.cgEntrance.port }}
+ wds.linkis.entrance.user.creator.ip.interceptor.switch=false
+
+ ## you may set service version if you want to distinguish different
configuration version
+ spring.eureka.instance.metadata-map.linkis.conf.version=v1
+
linkis-ps-publicservice.properties: |
wds.linkis.server.mdm.service.instance.expire-in-seconds=1800
linkis.workspace.filesystem.auto.create=true
##restful
-
wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.se
[...]
+
wds.linkis.server.restful.scan.packages=org.apache.linkis.cs.server.restful,org.apache.linkis.datasourcemanager.core.restful,org.apache.linkis.metadata.query.server.restful,org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.se
[...]
##mybatis
-
wds.linkis.server.mybatis.mapperLocations=classpath*:org/apache/linkis/cs/persistence/dao/impl/*.xml,classpath:org/apache/linkis/datasourcemanager/core/dao/mapper/*.xml,classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/
[...]
-
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
-
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
+
wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
+
wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.cs.persistence.entity,org.apache.linkis.datasourcemanager.common.domain,org.apache.linkis.datasourcemanager.core.vo,org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity,org.apache.linkis.bml.Entity,org.ap
[...]
+
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.cs.persistence.dao,org.apache.linkis.datasourcemanager.core.dao,org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao,org.apache.linkis.basedat
[...]
##workspace
wds.linkis.workspace.filesystem.hdfsuserrootpath.suffix=/
@@ -301,3 +324,6 @@ data:
spring.spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false
# ps-cs prefix must be started with 'cs_'
spring.eureka.instance.metadata-map.route=cs_1_dev
+
+ ## you may set service version if you want to distinguish different
configuration version
+ spring.eureka.instance.metadata-map.linkis.conf.version=v1
diff --git
a/linkis-dist/helm/charts/linkis/templates/linkis-cg-engineplugin.yaml
b/linkis-dist/helm/charts/linkis/templates/linkis-cg-engineplugin.yaml
deleted file mode 100644
index 130745f1e..000000000
--- a/linkis-dist/helm/charts/linkis/templates/linkis-cg-engineplugin.yaml
+++ /dev/null
@@ -1,223 +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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "linkis.fullname" . }}-cg-engineplugin
- labels:
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- {{- include "linkis.cgEnginePlugin.labels" . | nindent 4 }}
- annotations:
- prometheus.io/path: {{ .Values.cgEnginePlugin.prometheus.metricsPath }}
- prometheus.io/port: '{{ .Values.cgEnginePlugin.port }}'
- prometheus.io/scrape: 'true'
-spec:
- ports:
- - name: "http"
- protocol: TCP
- port: {{ .Values.cgEnginePlugin.port }}
- selector:
- {{- include "linkis.cgEnginePlugin.selectorLabels" . | nindent 4 }}
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- {{- toYaml .Values.svc | nindent 2 }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "linkis.fullname" . }}-cg-engineplugin-headless
- labels:
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- {{- include "linkis.cgEnginePlugin.labels" . | nindent 4 }}
- annotations:
- prometheus.io/path: {{ .Values.cgEnginePlugin.prometheus.metricsPath }}
- prometheus.io/port: '{{ .Values.cgEnginePlugin.port }}'
- prometheus.io/scrape: 'true'
-spec:
- ports:
- - name: "http"
- protocol: TCP
- port: {{ .Values.cgEnginePlugin.port }}
- selector:
- {{- include "linkis.cgEnginePlugin.selectorLabels" . | nindent 4 }}
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- clusterIP: None
- type: ClusterIP
- publishNotReadyAddresses: true
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "linkis.fullname" . }}-cg-engineplugin
- labels:
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- version: {{ .Chart.AppVersion }}
- {{- include "linkis.cgEnginePlugin.labels" . | nindent 4 }}
- {{- if .Values.cgEnginePlugin.annotations }}
- annotations:
- {{- toYaml .Values.cgEnginePlugin.annotations | nindent 4 }}
- {{- end }}
-spec:
- replicas: {{ .Values.cgEnginePlugin.replicas }}
- selector:
- matchLabels:
- {{- include "linkis.cgEnginePlugin.selectorLabels" . | nindent 6 }}
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- template:
- metadata:
- {{- with .Values.cgEnginePlugin.annotations }}
- annotations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- labels:
- app: {{ include "linkis.fullname" . }}-cg-engineplugin
- version: {{ .Chart.AppVersion }}
- {{- include "linkis.cgEnginePlugin.selectorLabels" . | nindent 8 }}
- spec:
- subdomain: {{ include "linkis.fullname" . }}-cg-engineplugin-headless
- {{- with .Values.imagePullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- volumes:
- - name: conf
- configMap:
- name: {{ include "linkis.fullname" . }}-linkis-config
- - name: log
- emptyDir: {}
- - name: common
- hostPath:
- path: {{ .Values.linkis.locations.commonDir }}
- type: DirectoryOrCreate
- - name: runtime
- {{- if .Values.linkis.featureGates.localMode }}
- hostPath:
- path: {{ .Values.linkis.locations.hostPath }}
- type: DirectoryOrCreate
- {{- else }}
- emptyDir: {}
- {{- end }}
- {{- if eq .Values.linkis.featureGates.localMode false }}
- - name: hadoop-conf
- projected:
- sources:
- - configMap:
- name: {{ .Values.linkis.deps.hadoop.configMapName }}
- - name: hive-conf
- projected:
- sources:
- - configMap:
- name: {{ .Values.linkis.deps.hive.configMapName }}
- - name: spark-conf
- projected:
- sources:
- - configMap:
- name: {{ .Values.linkis.deps.spark.configMapName }}
- {{- end }}
- serviceAccountName: {{ include "linkis.serviceAccountName" . }}
- securityContext:
- {{- toYaml .Values.cgEnginePlugin.podSecurityContext | nindent 8 }}
- containers:
- - name: "engineconnmanager"
- securityContext:
- {{- toYaml .Values.cgEnginePlugin.securityContext | nindent 12 }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag |
default .Chart.AppVersion }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- command:
- - /bin/bash
- - -ecx
- - >-
- RUN_IN_FOREGROUND=true
LINKIS_EXTENDED_LIB={{.Values.linkis.locations.commonDir}}/extendlib {{
.Values.linkis.locations.homeDir }}/sbin/linkis-daemon.sh start cg-engineplugin
- ports:
- - name: "http"
- containerPort: {{ .Values.cgEnginePlugin.port }}
- protocol: TCP
- {{- if .Values.linkis.featureGates.enableJvmRemoteDebug }}
- - name: "debug"
- containerPort: 5005
- protocol: TCP
- {{- end }}
- # TODO: replace with httpGet when spring-boot readiness probe is
implemented.
- readinessProbe:
- initialDelaySeconds: 15
- periodSeconds: 5
- timeoutSeconds: 20
- failureThreshold: 10
- tcpSocket:
- port: {{ .Values.cgEnginePlugin.port }}
- env:
- {{- if .Values.linkis.featureGates.enableJvmRemoteDebug }}
- - name: DEBUG_PORT
- value: "5005"
- {{- end }}
- {{- if eq .Values.linkis.featureGates.localMode false }}
- - name: HADOOP_CONF_DIR
- value: /etc/hadoop-conf
- - name: HIVE_CONF_DIR
- value: /etc/hive-conf
- - name: SPARK_CONF_DIR
- value: /etc/spark-conf
- {{- end }}
- - name: SERVER_HEAP_SIZE
- value: {{ .Values.cgEnginePlugin.jvmHeapSize }}
- - name: EUREKA_URL
- value: {{- include "linkis.registration.url" . | quote | indent
1 }}
- - name: EUREKA_PREFER_IP
- value: "true"
- - name: EUREKA_PORT
- value: "{{ .Values.mgEureka.port }}"
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- {{- if .Values.cgEnginePlugin.envs.extras }}
-{{ toYaml .Values.cgEnginePlugin.envs.extras | indent 12 }}
- {{- end }}
- {{- if .Values.cgEnginePlugin.envs.froms }}
- envFrom:
-{{ toYaml .Values.cgEnginePlugin.envs.froms | indent 12 }}
- {{- end }}
- volumeMounts:
- {{- if eq .Values.linkis.featureGates.localMode false }}
- - name: hadoop-conf
- mountPath: /etc/hadoop-conf
- - name: hive-conf
- mountPath: /etc/hive-conf
- - name: spark-conf
- mountPath: /etc/spark-conf
- {{- end }}
- - name: conf
- mountPath: {{ .Values.linkis.locations.confDir }}
- - name: log
- mountPath: {{ .Values.linkis.locations.logDir }}
- - name: runtime
- mountPath: {{ .Values.linkis.locations.runtimeDir }}
- - name: common
- mountPath: {{ .Values.linkis.locations.commonDir }}
- resources:
- {{- toYaml .Values.cgEnginePlugin.resources | nindent 12 }}
- {{- with .Values.cgEnginePlugin.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.cgEnginePlugin.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.cgEnginePlugin.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
