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 341a82a8 [chore] Change test related configuration (#605)
341a82a8 is described below
commit 341a82a8eb751401fda115f3231cd07a5241ec37
Author: Jian Zhong <[email protected]>
AuthorDate: Sun Feb 16 21:59:54 2025 +0800
[chore] Change test related configuration (#605)
---
manifests/charts/base/files/profile-default.yaml | 1 +
manifests/charts/base/templates/zzz_profile.yaml | 4 ++--
manifests/charts/base/values.yaml | 3 +++
.../dubbo-control/register-discovery/files/profile-default.yaml | 1 +
.../dubbo-control/register-discovery/templates/zzz_profile.yaml | 2 +-
manifests/charts/dubbo-control/register-discovery/values.yaml | 4 ++--
manifests/profiles/default.yaml | 5 ++---
manifests/profiles/demo.yaml | 1 -
manifests/profiles/empty.yaml | 1 -
operator/cmd/cluster/install.go | 2 +-
10 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/manifests/charts/base/files/profile-default.yaml
b/manifests/charts/base/files/profile-default.yaml
new file mode 100644
index 00000000..c70ebb93
--- /dev/null
+++ b/manifests/charts/base/files/profile-default.yaml
@@ -0,0 +1 @@
+test: false
\ No newline at end of file
diff --git a/manifests/charts/base/templates/zzz_profile.yaml
b/manifests/charts/base/templates/zzz_profile.yaml
index f4d368ef..4d4136f5 100644
--- a/manifests/charts/base/templates/zzz_profile.yaml
+++ b/manifests/charts/base/templates/zzz_profile.yaml
@@ -3,8 +3,8 @@
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
{{- end }}
-{{- $defaults := $.Values._internal_default_values_are_not_set }}
-{{- $_ := unset $.Values "_internal_default_values_are_not_set " }}
+{{- $defaults := $.Values._internal_default_values_not_set }}
+{{- $_ := unset $.Values "_internal_default_values_not_set " }}
{{- $profile := dict }}
{{- with (coalesce ($.Values).profile ($.Values.global).profile) }}
{{- with $.Files.Get (printf "files/profile-%s.yaml" .)}}
diff --git a/manifests/charts/base/values.yaml
b/manifests/charts/base/values.yaml
index 671a6d9c..f97a6955 100644
--- a/manifests/charts/base/values.yaml
+++ b/manifests/charts/base/values.yaml
@@ -16,3 +16,6 @@
_internal_default_values_not_set:
global:
dubboNamespace: dubbo-system
+ base:
+ # For dubboctl usage to disable dubbo config crds in base
+ enabledubboConfigCRDs: true
diff --git
a/manifests/charts/dubbo-control/register-discovery/files/profile-default.yaml
b/manifests/charts/dubbo-control/register-discovery/files/profile-default.yaml
new file mode 100644
index 00000000..c70ebb93
--- /dev/null
+++
b/manifests/charts/dubbo-control/register-discovery/files/profile-default.yaml
@@ -0,0 +1 @@
+test: false
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/templates/zzz_profile.yaml
b/manifests/charts/dubbo-control/register-discovery/templates/zzz_profile.yaml
index 4d4136f5..32c3348c 100644
---
a/manifests/charts/dubbo-control/register-discovery/templates/zzz_profile.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/templates/zzz_profile.yaml
@@ -1,4 +1,4 @@
-{{- if $.Values.defaults }}
+{{- if $.Values.defaults}}
{{ fail (cat
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
diff --git a/manifests/charts/dubbo-control/register-discovery/values.yaml
b/manifests/charts/dubbo-control/register-discovery/values.yaml
index f124e5e7..f328d2e6 100644
--- a/manifests/charts/dubbo-control/register-discovery/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/values.yaml
@@ -1,6 +1,6 @@
_internal_default_values_not_set:
- global:
- dubboNamespace: "dubbo-system"
+# global:
+ dubboNamespace: dubbo-system
zookeeper:
## Whether to enable the zookeeper.
enabled: false
diff --git a/manifests/profiles/default.yaml b/manifests/profiles/default.yaml
index 20b9d1c1..eca1b5dd 100644
--- a/manifests/profiles/default.yaml
+++ b/manifests/profiles/default.yaml
@@ -26,9 +26,8 @@ spec:
admin:
enabled: true
values:
- base:
- global:
- dubboNamespace: dubbo-system
+ global:
+ dubboNamespace: dubbo-system
diff --git a/manifests/profiles/demo.yaml b/manifests/profiles/demo.yaml
index d3064d8b..65e2e476 100644
--- a/manifests/profiles/demo.yaml
+++ b/manifests/profiles/demo.yaml
@@ -23,4 +23,3 @@ spec:
enabled: true
values:
profile: demo
-
diff --git a/manifests/profiles/empty.yaml b/manifests/profiles/empty.yaml
index 02c91471..9f3371b1 100644
--- a/manifests/profiles/empty.yaml
+++ b/manifests/profiles/empty.yaml
@@ -16,7 +16,6 @@
apiVersion: install.dubbo.io/v1alpha1
kind: DubboOperator
spec:
- profile: empty
components:
base:
enabled: false
diff --git a/operator/cmd/cluster/install.go b/operator/cmd/cluster/install.go
index c96640b7..5faa1d19 100644
--- a/operator/cmd/cluster/install.go
+++ b/operator/cmd/cluster/install.go
@@ -53,7 +53,7 @@ func InstallCmdWithArgs(ctx cli.Context, rootArgs *RootArgs,
iArgs *installArgs)
Short: "Applies an Dubbo manifest, installing or reconfiguring
Dubbo on a cluster",
Long: "The install command generates an Dubbo install manifest
and applies it to a cluster",
Example: ` # Apply a default dubboctl installation.
- dubboctl install
+ dubboctl install -y
# Apply a config file.
dubboctl install -f dop.yaml
