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 69f717e1 [charts] Remove dependencies and profile mode (#628)
69f717e1 is described below
commit 69f717e1425b56aafc39b3dea12ec4afa600def6
Author: Jian Zhong <[email protected]>
AuthorDate: Wed Feb 26 12:54:52 2025 +0800
[charts] Remove dependencies and profile mode (#628)
---
manifests/charts/admin/Chart.lock | 6 ------
manifests/charts/admin/Chart.yaml | 4 ----
.../admin/charts/kube-prometheus-stack-65.2.0.tgz | Bin 591234 -> 0 bytes
manifests/charts/admin/templates/configmap.yaml | 20 ++++++++++----------
manifests/profiles/default.yaml | 4 ++--
manifests/profiles/demo.yaml | 4 ++--
operator/pkg/apis/types.go | 1 -
operator/pkg/values/map.go | 1 -
8 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/manifests/charts/admin/Chart.lock
b/manifests/charts/admin/Chart.lock
deleted file mode 100644
index 46c24bc1..00000000
--- a/manifests/charts/admin/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: kube-prometheus-stack
- repository: https://prometheus-community.github.io/helm-charts
- version: 65.2.0
-digest: sha256:0e754f126dbd161d06feac3e7c9e0440481703ad752c3cc7856637de714970c9
-generated: "2025-02-24T10:38:39.357413157+08:00"
diff --git a/manifests/charts/admin/Chart.yaml
b/manifests/charts/admin/Chart.yaml
index 7a3bc673..22a62398 100644
--- a/manifests/charts/admin/Chart.yaml
+++ b/manifests/charts/admin/Chart.yaml
@@ -21,10 +21,6 @@ home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for dubbo admin dashboard.
version: 1.0.0
appVersion: 1.0.0
-dependencies:
- - name: kube-prometheus-stack
- version: "65.2.0"
- repository: "https://prometheus-community.github.io/helm-charts";
maintainers:
- name: mfordjody
email: [email protected]
diff --git a/manifests/charts/admin/charts/kube-prometheus-stack-65.2.0.tgz
b/manifests/charts/admin/charts/kube-prometheus-stack-65.2.0.tgz
deleted file mode 100644
index 9f39d06d..00000000
Binary files a/manifests/charts/admin/charts/kube-prometheus-stack-65.2.0.tgz
and /dev/null differ
diff --git a/manifests/charts/admin/templates/configmap.yaml
b/manifests/charts/admin/templates/configmap.yaml
index 0b921a8f..5ef88aed 100644
--- a/manifests/charts/admin/templates/configmap.yaml
+++ b/manifests/charts/admin/templates/configmap.yaml
@@ -33,18 +33,18 @@ data:
#!/bin/bash
set -eux
{{- if (eq $prom.enabled true) }}
-{{/* PROMETHEUS="https://prometheus-community.github.io/helm-charts"*/}}
+ PROMETHEUS="https://prometheus-community.github.io/helm-charts";
-{{/* helm pull {{ include "prom.stack.name" . }} --repo "$PROMETHEUS"
--version {{ $prom.image.tag }} --untar && \*/}}
+ helm pull {{ include "prom.stack.name" . }} --repo "$PROMETHEUS"
--version {{ $prom.image.tag }} --untar && \
-{{/* for i in {1..5}; do*/}}
-{{/* if rm -rf "{{ include "prom.stack.name" . }}-{{ $prom.image.tag
}}.tgz"; then*/}}
-{{/* break*/}}
-{{/* else*/}}
-{{/* echo "Attempt $i: Failed to remove directory, retrying in 2
seconds..."*/}}
-{{/* sleep 2*/}}
-{{/* fi*/}}
-{{/* done*/}}
+ for i in {1..5}; do
+ if rm -rf "{{ include "prom.stack.name" . }}-{{ $prom.image.tag }}.tgz";
then
+ break
+ else
+ echo "Attempt $i: Failed to remove directory, retrying in 2 seconds..."
+ sleep 2
+ fi
+ done
cp -r "/files/resources/dubbo-metrics.yaml" "{{ include "prom.stack.name"
. }}/templates/{{ include "grafana.name" . }}/dashboards-{{
$prom.dashboardsVersion }}"
ls -la "{{ include "prom.stack.name" . }}/templates/{{ include
"grafana.name" . }}/dashboards-{{ $prom.dashboardsVersion }}"
diff --git a/manifests/profiles/default.yaml b/manifests/profiles/default.yaml
index de9284b9..124fdb2e 100644
--- a/manifests/profiles/default.yaml
+++ b/manifests/profiles/default.yaml
@@ -24,9 +24,9 @@ spec:
enabled: true
register:
nacos:
- enabled: false
- zookeeper:
enabled: true
+ zookeeper:
+ enabled: false
dashboard:
admin:
enabled: true
diff --git a/manifests/profiles/demo.yaml b/manifests/profiles/demo.yaml
index 1236f3bb..05863519 100644
--- a/manifests/profiles/demo.yaml
+++ b/manifests/profiles/demo.yaml
@@ -23,8 +23,8 @@ spec:
enabled: true
register:
nacos:
- enabled: true
- zookeeper:
enabled: false
+ zookeeper:
+ enabled: true
values:
profile: demo
diff --git a/operator/pkg/apis/types.go b/operator/pkg/apis/types.go
index dbab4f81..71fffc16 100644
--- a/operator/pkg/apis/types.go
+++ b/operator/pkg/apis/types.go
@@ -19,7 +19,6 @@ type DubboOperator struct {
type DubboOperatorSpec struct {
Profile string `json:"profile,omitempty"`
- Control string `json:"control,omitempty"`
Dashboard *DubboDashboardSpec `json:"dashboard,omitempty"`
Components *DubboComponentSpec `json:"components,omitempty"`
Values json.RawMessage `json:"values,omitempty"`
diff --git a/operator/pkg/values/map.go b/operator/pkg/values/map.go
index 39f530a4..bbb0183c 100644
--- a/operator/pkg/values/map.go
+++ b/operator/pkg/values/map.go
@@ -72,7 +72,6 @@ func tableLookup(m Map, simple string) (Map, bool) {
return nil, false
}
-// GetPathMap key.subkey
func (m Map) GetPathMap(s string) (Map, bool) {
current := m
for _, n := range parsePath(s) {
