Skip to content

Commit 22d2bc2

Browse files
mfordjodymfordjody
authored
Release 0.1 (#740)
* [charts] Update release 0.1.2 * [charts] add dubbo icon
1 parent 9089391 commit 22d2bc2

File tree

10 files changed

+85
-208
lines changed

10 files changed

+85
-208
lines changed

‎manifests/charts/admin/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ annotations:
1818
licenses: Apache-2.0
1919
name: admin
2020
home: https://github.com/apache/dubbo-kubernetes
21+
icon: https://avatars.githubusercontent.com/u/11751992?s=200&v=4
2122
description: Helm chart for dubbo admin dashboard.
22-
version: 0.1.1
23+
version: 0.1.2
2324
appVersion: 1.0.0
2425
maintainers:
2526
- name: mfordjody

‎manifests/charts/admin/templates/_pod.tpl

Lines changed: 73 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,86 @@
11
{{- define "admin.pod" -}}
22
{{- $admin := .Values -}}
3+
{{- $zookeeper := .Values.zookeeper }}
4+
{{- $nacos := .Values.nacos }}
35
serviceAccountName: admin-sa
46
containers:
57
- name: admin
68
image: "{{ $admin.image }}:{{ $admin.tag }}"
79
imagePullPolicy: IfNotPresent
8-
args:
9-
- --config-file=/var/lib/admin/dubbo-cp.yaml
10+
env:
11+
- name: DUBBO_DEPLOY_MODE
12+
value: {{ .Values.deployMode | quote }}
13+
- name: DUBBO_MODE
14+
value: {{ .Values.mode | quote }}
15+
{{- if $nacos.enabled }}
16+
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
17+
value: {{ .Values.nacosAddress | quote }}
18+
- name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
19+
value: {{ .Values.nacosAddress | quote }}
20+
- name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
21+
value: {{ .Values.nacosAddress | quote }}
22+
{{- end }}
23+
{{- if $zookeeper.enabled }}
24+
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
25+
value: {{ .Values.zookeeperAddress | quote }}
26+
- name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
27+
value: {{ .Values.zookeeperAddress | quote }}
28+
- name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
29+
value: {{ .Values.zookeeperAddress | quote }}
30+
{{- else if not ($nacos.enabled) }}
31+
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
32+
value: {{ .Values.nacosAddress | quote }}
33+
- name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
34+
value: {{ .Values.nacosAddress | quote }}
35+
- name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
36+
value: {{ .Values.nacosAddress | quote }}
37+
{{- end }}
38+
- name: ADMIN_METRICDASHBOARDS_APPLICATION_BASEURL
39+
value: {{ .Values.grafanaAddress }}/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
40+
- name: ADMIN_METRICDASHBOARDS_INSTANCE_BASEURL
41+
value: {{ .Values.grafanaAddress }}/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
42+
- name: ADMIN_METRICDASHBOARDS_SERVICE_BASEURL
43+
value: {{ .Values.grafanaAddress }}/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
44+
- name: ADMIN_TRACEDASHBOARDS_APPLICATION_BASEURL
45+
value: {{ .Values.grafanaAddress }}/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
46+
- name: ADMIN_TRACEDASHBOARDS_INSTANCE_BASEURL
47+
value: {{ .Values.grafanaAddress }}/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
48+
- name: ADMIN_TRACEDASHBOARDS_SERVICE_BASEURL
49+
value: {{ .Values.grafanaAddress }}/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
50+
- name: ADMIN_PROMETHEUS
51+
value: {{ .Values.prometheusAddress | quote }}
52+
- name: ADMIN_GRAFANA
53+
value: {{ .Values.grafanaAddress | quote }}
54+
- name: ADMIN_AUTH_USER
55+
value: {{ .Values.user | quote }}
56+
- name: ADMIN_AUTH_PASSWORD
57+
value: {{ .Values.password | quote }}
58+
- name: ADMIN_AUTH_EXPIRATIONTIME
59+
value: {{ .Values.expirationTime | quote }}
1060
ports:
11-
- name: http
12-
containerPort: 8888
61+
- containerPort: 8888
1362
readinessProbe:
1463
httpGet:
1564
path: /admin
1665
port: 8888
17-
initialDelaySeconds: 1
18-
periodSeconds: 3
19-
timeoutSeconds: 5
66+
scheme: HTTP
67+
initialDelaySeconds: 5
68+
periodSeconds: 30
69+
livenessProbe:
70+
httpGet:
71+
path: /admin
72+
port: 8888
73+
scheme: HTTP
74+
initialDelaySeconds: 5
75+
periodSeconds: 30
76+
startupProbe:
77+
httpGet:
78+
path: /admin
79+
port: 8888
80+
scheme: HTTP
81+
failureThreshold: 6
82+
initialDelaySeconds: 30
83+
periodSeconds: 10
2084
securityContext:
2185
allowPrivilegeEscalation: false
2286
readOnlyRootFilesystem: false
@@ -27,9 +91,8 @@ containers:
2791
volumeMounts:
2892
- name: data
2993
mountPath: /var/lib/admin
30-
- name: config
31-
mountPath: /var/lib/admin/dubbo-cp.yaml
32-
subPath: dubbo-cp.yaml
94+
- name: data
95+
mountPath: /log
3396
{{- with $admin.volumeMounts }}
3497
{{- toYaml . | nindent 10 }}
3598
{{- end }}
@@ -38,10 +101,6 @@ resources:
38101
volumes:
39102
- name: data
40103
emptyDir: {}
41-
- name: config
42-
configMap:
43-
name: admin-config
44-
defaultMode: 0755
45104
{{- with $admin.volumes }}
46105
{{- toYaml . | nindent 6 }}
47106
{{- end }}

‎manifests/charts/admin/templates/configmap.yaml

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎manifests/charts/admin/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ _internal_default_values_not_set:
1818
rollingMaxSurge: 100%
1919
rollingMaxUnavailable: 25%
2020

21-
image: mfordjody/dubbo-cp
22-
tag: test
21+
image: sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/dubbo-cp
22+
tag: v0.1.2
2323

2424
volumeMounts: []
2525

‎manifests/charts/base/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ annotations:
1818
licenses: Apache-2.0
1919
name: base
2020
home: https://github.com/apache/dubbo-kubernetes
21+
icon: https://avatars.githubusercontent.com/u/11751992?s=200&v=4
2122
description: Helm chart for deploying dubbo cluster resources and CRDs.
22-
version: 0.1.1
23+
version: 0.1.2
2324
appVersion: 1.0.0
2425
maintainers:
2526
- name: mfordjody

‎manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ annotations:
1818
licenses: Apache-2.0
1919
name: nacos
2020
home: https://github.com/apache/dubbo-kubernetes
21+
icon: https://avatars.githubusercontent.com/u/11751992?s=200&v=4
2122
description: Helm chart for nacos register plane.
22-
version: 0.1.1
23+
version: 0.1.2
2324
appVersion: 1.0.0
2425
maintainers:
2526
- name: mfordjody

‎manifests/charts/dubbo-control/register-discovery/nacos/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _internal_default_values_not_set:
2222
# Number of replicas for the Deployment.
2323
replicas: 1
2424
# Deploy the required container images.
25-
image: nacos/nacos-server
25+
image: nacos-registry.cn-hangzhou.cr.aliyuncs.com/nacos/nacos-server
2626
# The size of application resources required for deployment.
2727
resources:
2828
requests:

‎manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ annotations:
1818
licenses: Apache-2.0
1919
name: zookeeper
2020
home: https://github.com/apache/dubbo-kubernetes
21+
icon: https://avatars.githubusercontent.com/u/11751992?s=200&v=4
2122
description: Helm chart for zookeeper register plane.
22-
version: 0.1.1
23+
version: 0.1.2
2324
appVersion: 1.0.0
2425
maintainers:
2526
- name: mfordjody

‎manifests/charts/dubbo-control/register-discovery/zookeeper/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _internal_default_values_not_set:
2020
# Number of replicas for the Deployment.
2121
replicas: 1
2222
# Deploy the required container images.
23-
image: docker.io/library/zookeeper
23+
image: sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/zookeeper
2424
# The size of application resources required for deployment.
2525
resources:
2626
requests:

‎release/downloadDubboctl.sh

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)