This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch release-0.1
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/release-0.1 by this push:
new ac4c9f5b [charts] Update release 0.1.2 (#739)
ac4c9f5b is described below
commit ac4c9f5b091b8491c85e4a7e357d3b55e16cbcfa
Author: Jian Zhong <[email protected]>
AuthorDate: Thu Jul 3 15:45:40 2025 +0800
[charts] Update release 0.1.2 (#739)
---
manifests/charts/admin/Chart.yaml | 2 +-
manifests/charts/admin/templates/_pod.tpl | 87 +++++++++++++---
manifests/charts/admin/templates/configmap.yaml | 70 -------------
manifests/charts/admin/values.yaml | 4 +-
manifests/charts/base/Chart.yaml | 2 +-
.../register-discovery/nacos/Chart.yaml | 2 +-
.../register-discovery/nacos/values.yaml | 2 +-
.../register-discovery/zookeeper/Chart.yaml | 2 +-
.../register-discovery/zookeeper/values.yaml | 2 +-
release/downloadDubboctl.sh | 116 ---------------------
10 files changed, 81 insertions(+), 208 deletions(-)
diff --git a/manifests/charts/admin/Chart.yaml
b/manifests/charts/admin/Chart.yaml
index c38d35cc..6c4512b2 100644
--- a/manifests/charts/admin/Chart.yaml
+++ b/manifests/charts/admin/Chart.yaml
@@ -19,7 +19,7 @@ annotations:
name: admin
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for dubbo admin dashboard.
-version: 0.1.1
+version: 0.1.2
appVersion: 1.0.0
maintainers:
- name: mfordjody
diff --git a/manifests/charts/admin/templates/_pod.tpl
b/manifests/charts/admin/templates/_pod.tpl
index e0b327ae..ebe18cc6 100644
--- a/manifests/charts/admin/templates/_pod.tpl
+++ b/manifests/charts/admin/templates/_pod.tpl
@@ -1,22 +1,86 @@
{{- define "admin.pod" -}}
{{- $admin := .Values -}}
+{{- $zookeeper := .Values.zookeeper }}
+{{- $nacos := .Values.nacos }}
serviceAccountName: admin-sa
containers:
- name: admin
image: "{{ $admin.image }}:{{ $admin.tag }}"
imagePullPolicy: IfNotPresent
- args:
- - --config-file=/var/lib/admin/dubbo-cp.yaml
+ env:
+ - name: DUBBO_DEPLOY_MODE
+ value: {{ .Values.deployMode | quote }}
+ - name: DUBBO_MODE
+ value: {{ .Values.mode | quote }}
+ {{- if $nacos.enabled }}
+ - name: DUBBO_STORE_TRADITIONAL_REGISTRY
+ value: {{ .Values.nacosAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
+ value: {{ .Values.nacosAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
+ value: {{ .Values.nacosAddress | quote }}
+ {{- end }}
+ {{- if $zookeeper.enabled }}
+ - name: DUBBO_STORE_TRADITIONAL_REGISTRY
+ value: {{ .Values.zookeeperAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
+ value: {{ .Values.zookeeperAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
+ value: {{ .Values.zookeeperAddress | quote }}
+ {{- else if not ($nacos.enabled) }}
+ - name: DUBBO_STORE_TRADITIONAL_REGISTRY
+ value: {{ .Values.nacosAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_CONFIG_CENTER
+ value: {{ .Values.nacosAddress | quote }}
+ - name: DUBBO_STORE_TRADITIONAL_METADATA_REPORT
+ value: {{ .Values.nacosAddress | quote }}
+ {{- end }}
+ - name: ADMIN_METRICDASHBOARDS_APPLICATION_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
+ - name: ADMIN_METRICDASHBOARDS_INSTANCE_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
+ - name: ADMIN_METRICDASHBOARDS_SERVICE_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
+ - name: ADMIN_TRACEDASHBOARDS_APPLICATION_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
+ - name: ADMIN_TRACEDASHBOARDS_INSTANCE_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
+ - name: ADMIN_TRACEDASHBOARDS_SERVICE_BASEURL
+ value: {{ .Values.grafanaAddress
}}/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
+ - name: ADMIN_PROMETHEUS
+ value: {{ .Values.prometheusAddress | quote }}
+ - name: ADMIN_GRAFANA
+ value: {{ .Values.grafanaAddress | quote }}
+ - name: ADMIN_AUTH_USER
+ value: {{ .Values.user | quote }}
+ - name: ADMIN_AUTH_PASSWORD
+ value: {{ .Values.password | quote }}
+ - name: ADMIN_AUTH_EXPIRATIONTIME
+ value: {{ .Values.expirationTime | quote }}
ports:
- - name: http
- containerPort: 8888
+ - containerPort: 8888
readinessProbe:
httpGet:
path: /admin
port: 8888
- initialDelaySeconds: 1
- periodSeconds: 3
- timeoutSeconds: 5
+ scheme: HTTP
+ initialDelaySeconds: 5
+ periodSeconds: 30
+ livenessProbe:
+ httpGet:
+ path: /admin
+ port: 8888
+ scheme: HTTP
+ initialDelaySeconds: 5
+ periodSeconds: 30
+ startupProbe:
+ httpGet:
+ path: /admin
+ port: 8888
+ scheme: HTTP
+ failureThreshold: 6
+ initialDelaySeconds: 30
+ periodSeconds: 10
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: false
@@ -27,9 +91,8 @@ containers:
volumeMounts:
- name: data
mountPath: /var/lib/admin
- - name: config
- mountPath: /var/lib/admin/dubbo-cp.yaml
- subPath: dubbo-cp.yaml
+ - name: data
+ mountPath: /log
{{- with $admin.volumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
@@ -38,10 +101,6 @@ resources:
volumes:
- name: data
emptyDir: {}
-- name: config
- configMap:
- name: admin-config
- defaultMode: 0755
{{- with $admin.volumes }}
{{- toYaml . | nindent 6 }}
{{- end }}
diff --git a/manifests/charts/admin/templates/configmap.yaml
b/manifests/charts/admin/templates/configmap.yaml
deleted file mode 100644
index 697e6e52..00000000
--- a/manifests/charts/admin/templates/configmap.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-{{ $nacos := .Values.nacos }}
-{{ $zookeeper := .Values.zookeeper }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: admin-config
- namespace: {{ .Release.Namespace }}
- labels:
- app: admin
- dubbo.io/rev: {{ default "default" | quote }}
- install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
- operator.dubbo.io/component: "Admin"
- dubbo: admin
- release: {{ .Release.Name }}
- app.kubernetes.io/name: "dashboard"
-data:
- dubbo-cp.yaml: |-
- deployMode: {{ .Values.deployMode }}
- mode: {{ .Values.mode }}
- store:
- {{- if $nacos.enabled }}
- # Traditional Store support nacos and zookeeper
- traditional:
- registry:
- address: {{ .Values.nacosAddress }}
- configCenter:
- address: {{ .Values.nacosAddress }}
- metadataReport:
- address: {{ .Values.nacosAddress }}
- {{- end }}
- {{- if $zookeeper.enabled }}
- traditional:
- registry:
- address: {{ .Values.zookeeperAddress }}
- configCenter:
- address: {{ .Values.zookeeperAddress }}
- metadataReport:
- address: {{ .Values.zookeeperAddress }}
- {{- end }}
- admin:
- # metric and trace grafana dashboards
- metricDashboards:
- application:
- baseURL: {{ .Values.grafanaAddress
}}/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
- instance:
- baseURL: {{ .Values.grafanaAddress
}}/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
- service:
- baseURL: {{ .Values.grafanaAddress
}}/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service/
- traceDashboards:
- application:
- baseURL: {{ .Values.grafanaAddress
}}/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
- instance:
- baseURL: {{ .Values.grafanaAddress
}}/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
- service:
- baseURL: {{ .Values.grafanaAddress
}}/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
- prometheus: {{ .Values.prometheusAddress }}
- # grafana should custom configs below:
- # [server]
- # root_url = %(protocol)s://%(domain)s：%(http_port)s/grafana
- # allowed_origins = *
- # serve_from_sub_path = true
- # [security]
- # allow_embedding = true
- # [auth.anonymous]
- # enabled = true
- grafana: {{ .Values.grafana }}
- auth:
- user: {{ .Values.user }}
- password: {{ .Values.password }}
- expirationTime: {{ .Values.expirationTime }}
\ No newline at end of file
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 7b9b9346..d486f612 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -18,8 +18,8 @@ _internal_default_values_not_set:
rollingMaxSurge: 100%
rollingMaxUnavailable: 25%
- image: mfordjody/dubbo-cp
- tag: test
+ image: sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/dubbo-cp
+ tag: v0.1.2
volumeMounts: []
diff --git a/manifests/charts/base/Chart.yaml b/manifests/charts/base/Chart.yaml
index 8026e987..5581603e 100644
--- a/manifests/charts/base/Chart.yaml
+++ b/manifests/charts/base/Chart.yaml
@@ -19,7 +19,7 @@ annotations:
name: base
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for deploying dubbo cluster resources and CRDs.
-version: 0.1.1
+version: 0.1.2
appVersion: 1.0.0
maintainers:
- name: mfordjody
diff --git a/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
index f16fad1c..b4ffbee1 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
@@ -19,7 +19,7 @@ annotations:
name: nacos
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for nacos register plane.
-version: 0.1.1
+version: 0.1.2
appVersion: 1.0.0
maintainers:
- name: mfordjody
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
index e8dbda81..0f66c01b 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
@@ -22,7 +22,7 @@ _internal_default_values_not_set:
# Number of replicas for the Deployment.
replicas: 1
# Deploy the required container images.
- image: nacos/nacos-server
+ image: nacos-registry.cn-hangzhou.cr.aliyuncs.com/nacos/nacos-server
# The size of application resources required for deployment.
resources:
requests:
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
index c833dd2f..38cb6be7 100644
--- a/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
@@ -19,7 +19,7 @@ annotations:
name: zookeeper
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for zookeeper register plane.
-version: 0.1.1
+version: 0.1.2
appVersion: 1.0.0
maintainers:
- name: mfordjody
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/values.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/values.yaml
index 6c29e11d..4a72f813 100644
--- a/manifests/charts/dubbo-control/register-discovery/zookeeper/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/zookeeper/values.yaml
@@ -20,7 +20,7 @@ _internal_default_values_not_set:
# Number of replicas for the Deployment.
replicas: 1
# Deploy the required container images.
- image: docker.io/library/zookeeper
+ image: sca-registry.cn-hangzhou.cr.aliyuncs.com/dubbo/zookeeper
# The size of application resources required for deployment.
resources:
requests:
diff --git a/release/downloadDubboctl.sh b/release/downloadDubboctl.sh
deleted file mode 100644
index f09ecc45..00000000
--- a/release/downloadDubboctl.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-set -e
-
-# Determines the operating system.
-OS="${TARGET_OS:-$(uname)}"
-if [ "${OS}" = "Darwin" ] ; then
- OSEXT="osx"
-else
- OSEXT="linux"
-fi
-
-# Determine the latest Dubboctl version by version number ignoring alpha,
beta, and rc versions.
-if [ "${DUBBO_VERSION}" = "" ] ; then
- DUBBO_VERSION="$(curl -s
https://api.github.com/repos/apache/dubbo-kubernetes/releases | \
- grep '"tag_name":' | \
- grep -vE '(alpha|beta|rc)' | \
- head -1 | \
- sed -E 's/.*"([^"]+)".*/\1/')"
- DUBBO_VERSION="${DUBBO_VERSION##*/}"
-fi
-
-if [ "${DUBBOCTL_VERSION}" = "" ] ; then
- printf "Unable to get latest Dubboctl version. Set DUBBOCTL_VERSION env var
and re-run. For example: export DUBBOCTL_VERSION=0.1.0\n"
- exit 1;
-fi
-
-LOCAL_ARCH=$(uname -m)
-if [ "${TARGET_ARCH}" ]; then
- LOCAL_ARCH=${TARGET_ARCH}
-fi
-
-case "${LOCAL_ARCH}" in
- x86_64|amd64)
- DUBBOCTL_ARCH=amd64
- ;;
- armv8*|aarch64*|arm64)
- DUBBOCTL_ARCH=arm64
- ;;
- armv*)
- DUBBOCTL_ARCH=armv7
- ;;
- *)
- echo "This system's architecture, ${LOCAL_ARCH}, isn't supported"
- exit 1
- ;;
-esac
-
-download_failed () {
- printf "Download failed, please make sure your DUBBO_VERSION is correct and
verify the download URL exists!"
- exit 1
-}
-
-download_failed
-
-# Downloads the dubboctl binary archive.
-tmp=$(mktemp -d /tmp/dubboctl.XXXXXX)
-NAME="dubboctl-${DUBBO_VERSION}"
-URL="https://github.com/apache/dubbo-kubernetes/releases/download/${DUBBOCTL_VERSION}/dubboctl-${DUBBOCTL_VERSION}-${OSEXT}-${DUBBOCTL_ARCH}.tar.gz";
-ARCH_URL="https://github.com/apache/dubbo-kubernetes/releases/download/${DUBBOCTL_VERSION}/dubboctl-${DUBBOCTL_VERSION}-${OSEXT}-${DUBBOCTL_ARCH}.tar.gz";
-
-with_arch() {
- printf "\nDownloading %s from %s ...\n" "${NAME}" "$ARCH_URL"
- if ! curl -o /dev/null -sIf "$ARCH_URL"; then
- printf "\n%s is not found, please specify a valid DUBBOCTL_VERSION and
TARGET_ARCH\n" "$ARCH_URL"
- exit 1
- fi
- filename="dubboctl-${DUBBOCTL_VERSION}-${OSEXT}-${DUBBOCTL_ARCH}.tar.gz"
- curl -fsL -o "${tmp}/${filename}" "$ARCH_URL"
- tar -xzf "${tmp}/${filename}" -C "${tmp}"
-}
-
-without_arch() {
- printf "\nDownloading %s from %s ..." "$NAME" "$URL"
- if ! curl -o /dev/null -sIf "$URL"; then
- printf "\n%s is not found, please specify a valid DUBBO_VERSION\n" "$URL"
- exit 1
- fi
- curl -fsLO "$URL"
- filename="dubboctl-${DUBBO_VERSION}-${OSEXT}.tar.gz"
- curl -fsL -o "${tmp}/${filename}" "$URL"
- tar -xzf "${tmp}/${filename}" -C "${tmp}"
-}
-
-with_arch
-without_arch
-
-# setup dubboctl
-mkdir -p "$HOME/.dubboctl/bin"
-mv "${tmp}/dubboctl" "$HOME/.dubboctl/bin/dubboctl"
-chmod +x "$HOME/.dubboctl/bin/dubboctl"
-rm -r "${tmp}"
-
-printf "%s download complete!\n" "${filename}"
-
-# Print message
-printf "\n"
-printf "Add the dubboctl to your path with:"
-printf "\n"
-printf " export PATH=\$HOME/.dubboctl/bin:\$PATH \n"
-printf "\n"
