This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new af0993b5 chore: Zipkin supports namespaces (#196)
af0993b5 is described below
commit af0993b5298506b5795775b821a94c4e9c43f5de
Author: Jian Zhong <11638...@qq.com>
AuthorDate: Fri Apr 19 13:18:35 2024 +0800
chore: Zipkin supports namespaces (#196)
---
deploy/addons/env.sh | 4 ++--
deploy/addons/values-zipkin.yaml | 19 +++++++++----------
deploy/kubernetes/zipkin.yaml | 17 ++++++++++-------
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/deploy/addons/env.sh b/deploy/addons/env.sh
index 58ba1d24..8becf65a 100644
--- a/deploy/addons/env.sh
+++ b/deploy/addons/env.sh
@@ -75,7 +75,7 @@ helm template skywalking skywalking \
# Set up zipkin
helm template zipkin zipkin \
--namespace dubbo-system \
- --version 0.3.0 \
- --repo https://openzipkin.github.io/zipkin \
+ --version 0.1.2 \
+ --repo https://zipkin.io/zipkin-helm \
-f "${WORKDIR}/values-zipkin.yaml" \
> "${KUBERNETES}/zipkin.yaml"
\ No newline at end of file
diff --git a/deploy/addons/values-zipkin.yaml b/deploy/addons/values-zipkin.yaml
index 60e5e17e..f7a5bfa0 100644
--- a/deploy/addons/values-zipkin.yaml
+++ b/deploy/addons/values-zipkin.yaml
@@ -13,16 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ui:
- image:
- repository: openzipkin/zipkin-ui
+image:
+ repository: openzipkin/zipkin-slim
+ pullPolicy: IfNotPresent
-collector:
- image:
- repository: openzipkin/zipkin
+serviceAccount:
+ create: true
-dependencies:
+ingress:
enabled: false
- cron: "* 0 * * *"
- image:
- repository: openzipkin/zipkin-dependencies
\ No newline at end of file
+
+autoscaling:
+ enabled: false
\ No newline at end of file
diff --git a/deploy/kubernetes/zipkin.yaml b/deploy/kubernetes/zipkin.yaml
index b75b4a2a..8330430b 100644
--- a/deploy/kubernetes/zipkin.yaml
+++ b/deploy/kubernetes/zipkin.yaml
@@ -19,11 +19,12 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: zipkin
+ namespace: dubbo-system
labels:
- helm.sh/chart: zipkin-0.3.0
+ helm.sh/chart: zipkin-0.1.2
app.kubernetes.io/name: zipkin
app.kubernetes.io/instance: zipkin
- app.kubernetes.io/version: "2.23.16"
+ app.kubernetes.io/version: "3.0.3"
app.kubernetes.io/managed-by: Helm
---
# Source: zipkin/templates/service.yaml
@@ -31,11 +32,12 @@ apiVersion: v1
kind: Service
metadata:
name: zipkin
+ namespace: dubbo-system
labels:
- helm.sh/chart: zipkin-0.3.0
+ helm.sh/chart: zipkin-0.1.2
app.kubernetes.io/name: zipkin
app.kubernetes.io/instance: zipkin
- app.kubernetes.io/version: "2.23.16"
+ app.kubernetes.io/version: "3.0.3"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
@@ -53,11 +55,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: zipkin
+ namespace: dubbo-system
labels:
- helm.sh/chart: zipkin-0.3.0
+ helm.sh/chart: zipkin-0.1.2
app.kubernetes.io/name: zipkin
app.kubernetes.io/instance: zipkin
- app.kubernetes.io/version: "2.23.16"
+ app.kubernetes.io/version: "3.0.3"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
@@ -83,7 +86,7 @@ spec:
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
- image: "openzipkin/zipkin-slim:2.23.16"
+ image: "openzipkin/zipkin-slim:3.0.3"
env:
- name: STORAGE_TYPE
value: "mem"
