You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by mo...@apache.org on 2022/11/25 07:31:50 UTC
[incubator-streampark] branch helm updated: [bug]Repair helm is unavailable
This is an automated email from the ASF dual-hosted git repository.
monster pushed a commit to branch helm
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/helm by this push:
new b94a09ca4 [bug]Repair helm is unavailable
b94a09ca4 is described below
commit b94a09ca4edec15c332b1a923fea50bf3bdf0934
Author: shihong90 <25...@qq.com>
AuthorDate: Fri Nov 25 15:31:41 2022 +0800
[bug]Repair helm is unavailable
---
deploy/docker/docker-compose.yaml | 2 -
deploy/helm/{streamx => streampark}/.helmignore | 0
deploy/helm/{streamx => streampark}/Chart.yaml | 2 +
.../ValidationMessages.properties | 0
.../streampark-console-config/application-h2.yml} | 24 +++---
.../application-mysql.yml} | 17 ++--
.../application-pgsql.yml} | 17 ++--
.../streampark-console-config}/application.yml | 95 +++++++++-------------
.../conf/streampark-console-config}/kerberos.yml | 2 +
.../streampark-console-config}/logback-spring.xml | 0
.../conf/streampark-console-config}/spy.properties | 4 +-
.../{streamx => streampark}/templates/NOTES.txt | 0
.../{streamx => streampark}/templates/_helpers.tpl | 0
.../templates/configmap.yaml | 21 +++++
.../{streamx => streampark}/templates/ingress.yaml | 0
.../{streamx => streampark}/templates/rbac.yaml | 0
.../{streamx => streampark}/templates/service.yaml | 0
.../templates/serviceaccount.yaml | 0
.../templates/streampark.yml | 6 ++
deploy/helm/{streamx => streampark}/values.yaml | 2 +-
20 files changed, 99 insertions(+), 93 deletions(-)
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index 29e6f38e2..8354c2af0 100644
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -32,7 +32,6 @@ services:
networks:
- streampark
-
jobmanager:
image: ${FLINK_BASE_IMAGE}
ports:
@@ -46,7 +45,6 @@ services:
networks:
- streampark
-
taskmanager:
image: ${FLINK_BASE_IMAGE}
depends_on:
diff --git a/deploy/helm/streamx/.helmignore b/deploy/helm/streampark/.helmignore
similarity index 100%
rename from deploy/helm/streamx/.helmignore
rename to deploy/helm/streampark/.helmignore
diff --git a/deploy/helm/streamx/Chart.yaml b/deploy/helm/streampark/Chart.yaml
similarity index 90%
rename from deploy/helm/streamx/Chart.yaml
rename to deploy/helm/streampark/Chart.yaml
index bc1b84535..275ea9e24 100644
--- a/deploy/helm/streamx/Chart.yaml
+++ b/deploy/helm/streampark/Chart.yaml
@@ -17,6 +17,8 @@
apiVersion: v2
name: streampark
description: A Helm chart for the Apache StreamPark
+home: https://streampark.apache.org
+icon: https://streampark.apache.org/image/logo_name.png
type: application
version: 2.0.0
appVersion: 2.0.0
diff --git a/deploy/helm/streamx/conf/streamx-console-config/ValidationMessages.properties b/deploy/helm/streampark/conf/streampark-console-config/ValidationMessages.properties
similarity index 100%
rename from deploy/helm/streamx/conf/streamx-console-config/ValidationMessages.properties
rename to deploy/helm/streampark/conf/streampark-console-config/ValidationMessages.properties
diff --git a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml b/deploy/helm/streampark/conf/streampark-console-config/application-h2.yml
similarity index 67%
copy from deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
copy to deploy/helm/streampark/conf/streampark-console-config/application-h2.yml
index 78e28b245..1680a8aff 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/application-h2.yml
@@ -15,14 +15,16 @@
# limitations under the License.
#
-security:
- kerberos:
- login:
- enable: false
- principal:
- krb5:
- keytab:
-java:
- security:
- krb5:
- conf:
+spring:
+ datasource:
+ driver-class-name: org.h2.Driver
+ url: jdbc:h2:mem:streampark;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:db/schema-h2.sql'
+ username: sa
+ password: sa
+ sql:
+ init:
+ data-locations: classpath:db/data-h2.sql
+ continue-on-error: true
+ username: sa
+ password: sa
+ mode: always
diff --git a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml b/deploy/helm/streampark/conf/streampark-console-config/application-mysql.yml
similarity index 70%
copy from deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
copy to deploy/helm/streampark/conf/streampark-console-config/application-mysql.yml
index 78e28b245..e8d0b760a 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/application-mysql.yml
@@ -15,14 +15,9 @@
# limitations under the License.
#
-security:
- kerberos:
- login:
- enable: false
- principal:
- krb5:
- keytab:
-java:
- security:
- krb5:
- conf:
+spring:
+ datasource:
+ username: root
+ password: streampark
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/streampark?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
diff --git a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml b/deploy/helm/streampark/conf/streampark-console-config/application-pgsql.yml
similarity index 80%
copy from deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
copy to deploy/helm/streampark/conf/streampark-console-config/application-pgsql.yml
index 78e28b245..99f8400d1 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/application-pgsql.yml
@@ -15,14 +15,9 @@
# limitations under the License.
#
-security:
- kerberos:
- login:
- enable: false
- principal:
- krb5:
- keytab:
-java:
- security:
- krb5:
- conf:
+spring:
+ datasource:
+ username: postgres
+ password: streampark
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://localhost:5432/streampark?stringtype=unspecified
diff --git a/deploy/helm/streamx/conf/streamx-console-config/application.yml b/deploy/helm/streampark/conf/streampark-console-config/application.yml
similarity index 61%
rename from deploy/helm/streamx/conf/streamx-console-config/application.yml
rename to deploy/helm/streampark/conf/streampark-console-config/application.yml
index b318affad..a7560a715 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/application.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/application.yml
@@ -28,39 +28,27 @@ logging:
level:
root: info
+swagger:
+ enable: true
+
+knife4j:
+ enable: true
+ basic:
+ # basic authentication, used to access swagger-ui and doc
+ enable: false
+ username: admin
+ password: streampark
+
spring:
- application.name: streampark
- mvc:
- pathmatch:
- matching-strategy: ant_path_matcher
- devtools:
- restart:
- enabled: false
+ profiles.active: h2 #[h2,pgsql,mysql]
+ application.name: StreamPark
+ devtools.restart.enabled: false
+ mvc.pathmatch.matching-strategy: ant_path_matcher
servlet:
multipart:
enabled: true
max-file-size: 500MB
max-request-size: 500MB
- datasource:
- dynamic:
- # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
- p6spy: false
- hikari:
- connection-timeout: 30000
- max-lifetime: 1800000
- max-pool-size: 15
- min-idle: 5
- connection-test-query: select 1
- pool-name: HikariCP-DS-POOL
- # 配置默认数据源
- primary: primary
- datasource:
- # 数据源-1，名称为 primary
- primary:
- username: root
- password: 123456
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/streampark?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
aop.proxy-target-class: true
messages.encoding: utf-8
jackson:
@@ -75,9 +63,15 @@ management:
endpoints:
web:
exposure:
- include: [ 'httptrace', 'metrics' ]
+ include: [ 'health', 'httptrace', 'metrics' ]
+ endpoint:
+ health:
+ enabled: true
+ show-details: always
+ probes:
+ enabled: true
-#mybatis plus 设置
+# mybatis plus setting
mybatis-plus:
type-aliases-package: org.apache.streampark.console.*.entity
mapper-locations: classpath:mapper/*/*.xml
@@ -86,12 +80,12 @@ mybatis-plus:
global-config:
db-config:
id-type: auto
- # 关闭 mybatis-plus的 banner
+ # close mybatis-plus banner
banner: false
streampark:
proxy:
- # knox 代理地址 https://cdpsit02.example.cn:8443/gateway/cdp-proxy/yarn
+ # knox process address https://cdpsit02.example.cn:8443/gateway/cdp-proxy/yarn
yarn-url:
yarn:
# default sample, or kerberos
@@ -99,15 +93,13 @@ streampark:
# HADOOP_USER_NAME
hadoop-user-name: hdfs
- # 本地的工作空间,用于存放项目源码,构建的目录等.
+ # local workspace, used to store source code and build dir etc.
workspace:
local: /opt/streampark_workspace
remote: hdfs://hdfscluster/streampark # support hdfs:///streampark/ 、 /streampark 、hdfs://host:ip/streampark/
# remote docker register namespace for streampark
docker:
- register:
- image-namespace: streampark
# instantiating DockerHttpClient
http-client:
max-connections: 10000
@@ -133,27 +125,20 @@ streampark:
exec-cron: 0 0 0/6 * * ?
shiro:
- # token有效期，单位秒
+ # token timeout, unit second
jwtTimeOut: 86400
- # 后端免认证接口 url
+ # backend authentication-free resources url
anonUrl: >
- /passport/**,
- /systemName,
- /user/check/**,
- /websocket/**,
- /metrics/**,
- /index.html,
- /assets/**,
- /resource/**/**,
- /css/**,
- /fonts/**,
- /img/**,
- /js/**,
- /loading/**,
- /*.js,
- /*.png,
- /*.jpg,
- /*.less,
- /*.ico,
- /
+ldap:
+ ## AD server IP, default port 389
+ urls: ldap://99.99.99.99:389
+ ## Login Account
+ base-dn: dc=streampark,dc=com
+ username: cn=Manager,dc=streampark,dc=com
+ password: streampark
+ user:
+ identity-attribute: uid
+ email-attribute: mail
+ # action when ldap user is not exist (supported types: CREATE,DENY)
+ not-exist-action: CREATE
diff --git a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml b/deploy/helm/streampark/conf/streampark-console-config/kerberos.yml
similarity index 95%
rename from deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
rename to deploy/helm/streampark/conf/streampark-console-config/kerberos.yml
index 78e28b245..6a5e0ccab 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/kerberos.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/kerberos.yml
@@ -17,8 +17,10 @@
security:
kerberos:
+ ttl: 2h # unit [s|m|h|d]
login:
enable: false
+ debug: false
principal:
krb5:
keytab:
diff --git a/deploy/helm/streamx/conf/streamx-console-config/logback-spring.xml b/deploy/helm/streampark/conf/streampark-console-config/logback-spring.xml
similarity index 100%
rename from deploy/helm/streamx/conf/streamx-console-config/logback-spring.xml
rename to deploy/helm/streampark/conf/streampark-console-config/logback-spring.xml
diff --git a/deploy/helm/streamx/conf/streamx-console-config/spy.properties b/deploy/helm/streampark/conf/streampark-console-config/spy.properties
similarity index 88%
rename from deploy/helm/streamx/conf/streamx-console-config/spy.properties
rename to deploy/helm/streampark/conf/streampark-console-config/spy.properties
index a8a406220..c6ea274b8 100755
--- a/deploy/helm/streamx/conf/streamx-console-config/spy.properties
+++ b/deploy/helm/streampark/conf/streampark-console-config/spy.properties
@@ -15,7 +15,7 @@
# limitations under the License.
#
-# p6spy configuration and use https://p6spy.readthedocs.io/en/latest/configandusage.htmlp6spy configuration and use https://p6spy.readthedocs.io/en/latest/configandusage.html
+# p6spy configuration and use https://p6spy.readthedocs.io/en/latest/configandusage.html
# Use logging system to record sql
appender=com.p6spy.engine.spy.appender.Slf4JLogger
# Customized log printing
@@ -24,7 +24,7 @@ logMessageFormat=org.apache.streampark.console.base.config.P6spySqlFormatConfig
outagedetection=true
# Slow SQL logging standards:second
outagedetectioninterval=2
-# Whether to enable log filtering default false, this configuration takes effect if include/exclude/sqlexpression is configuredz
+# Whether to enable log filtering default false, this configuration takes effect if include/exclude/sqlexpression is configured
filter=true
# Comma-separated list of table names excluded when filtering Logs Default is empty
exclude=QRTZ
diff --git a/deploy/helm/streamx/templates/NOTES.txt b/deploy/helm/streampark/templates/NOTES.txt
similarity index 100%
rename from deploy/helm/streamx/templates/NOTES.txt
rename to deploy/helm/streampark/templates/NOTES.txt
diff --git a/deploy/helm/streamx/templates/_helpers.tpl b/deploy/helm/streampark/templates/_helpers.tpl
similarity index 100%
rename from deploy/helm/streamx/templates/_helpers.tpl
rename to deploy/helm/streampark/templates/_helpers.tpl
diff --git a/deploy/helm/streamx/templates/configmap.yaml b/deploy/helm/streampark/templates/configmap.yaml
similarity index 71%
rename from deploy/helm/streamx/templates/configmap.yaml
rename to deploy/helm/streampark/templates/configmap.yaml
index 10d6d7fe0..d2d7fcce8 100644
--- a/deploy/helm/streamx/templates/configmap.yaml
+++ b/deploy/helm/streampark/templates/configmap.yaml
@@ -29,6 +29,27 @@ data:
{{- end }}
{{- if index (.Values.streamParkDefaultConfiguration) "application.yml" }}
{{- index (.Values.streamParkDefaultConfiguration) "application.yml" | nindent 4 -}}
+{{- end }}
+ application-h2.yml: |+
+{{- if .Values.streamParkDefaultConfiguration.append }}
+ {{- $.Files.Get "conf/streampark-console-config/application-h2.yml" | nindent 4 -}}
+{{- end }}
+{{- if index (.Values.streamParkDefaultConfiguration) "application-h2.yml" }}
+ {{- index (.Values.streamParkDefaultConfiguration) "application-h2.yml" | nindent 4 -}}
+{{- end }}
+ application-mysql.yml: |+
+{{- if .Values.streamParkDefaultConfiguration.append }}
+ {{- $.Files.Get "conf/streampark-console-config/application-mysql.yml" | nindent 4 -}}
+{{- end }}
+{{- if index (.Values.streamParkDefaultConfiguration) "application-mysql.yml" }}
+ {{- index (.Values.streamParkDefaultConfiguration) "application-mysql.yml" | nindent 4 -}}
+{{- end }}
+ application-pgsql.yml: |+
+{{- if .Values.streamParkDefaultConfiguration.append }}
+ {{- $.Files.Get "conf/streampark-console-config/application-pgsql.yml" | nindent 4 -}}
+{{- end }}
+{{- if index (.Values.streamParkDefaultConfiguration) "application-pgsql.yml" }}
+ {{- index (.Values.streamParkDefaultConfiguration) "application-pgsql.yml" | nindent 4 -}}
{{- end }}
logback-spring.xml: |+
{{- if .Values.streamParkDefaultConfiguration.append }}
diff --git a/deploy/helm/streamx/templates/ingress.yaml b/deploy/helm/streampark/templates/ingress.yaml
similarity index 100%
rename from deploy/helm/streamx/templates/ingress.yaml
rename to deploy/helm/streampark/templates/ingress.yaml
diff --git a/deploy/helm/streamx/templates/rbac.yaml b/deploy/helm/streampark/templates/rbac.yaml
similarity index 100%
rename from deploy/helm/streamx/templates/rbac.yaml
rename to deploy/helm/streampark/templates/rbac.yaml
diff --git a/deploy/helm/streamx/templates/service.yaml b/deploy/helm/streampark/templates/service.yaml
similarity index 100%
rename from deploy/helm/streamx/templates/service.yaml
rename to deploy/helm/streampark/templates/service.yaml
diff --git a/deploy/helm/streamx/templates/serviceaccount.yaml b/deploy/helm/streampark/templates/serviceaccount.yaml
similarity index 100%
rename from deploy/helm/streamx/templates/serviceaccount.yaml
rename to deploy/helm/streampark/templates/serviceaccount.yaml
diff --git a/deploy/helm/streamx/templates/streampark.yml b/deploy/helm/streampark/templates/streampark.yml
similarity index 92%
rename from deploy/helm/streamx/templates/streampark.yml
rename to deploy/helm/streampark/templates/streampark.yml
index c7efe54ab..f9911dcba 100755
--- a/deploy/helm/streamx/templates/streampark.yml
+++ b/deploy/helm/streampark/templates/streampark.yml
@@ -73,6 +73,12 @@ spec:
items:
- key: application.yml
path: application.yml
+ - key: application-h2.yml
+ path: application-h2.yml
+ - key: application-mysql.yml
+ path: application-mysql.yml
+ - key: application-pgsql.yml
+ path: application-pgsql.yml
- key: logback-spring.xml
path: logback-spring.xml
- key: kerberos.yml
diff --git a/deploy/helm/streamx/values.yaml b/deploy/helm/streampark/values.yaml
similarity index 99%
rename from deploy/helm/streamx/values.yaml
rename to deploy/helm/streampark/values.yaml
index ebb33a5c9..f4d717b76 100644
--- a/deploy/helm/streamx/values.yaml
+++ b/deploy/helm/streampark/values.yaml
@@ -50,7 +50,7 @@ spec:
# cpu: "500m"
ingress:
- enabled: true
+ enabled: false
host: "streampark.apache.org"
path: "/streampark"
annotations: {}