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 3d381fa4 [charts] base Installation test completed (#455)
3d381fa4 is described below
commit 3d381fa46278744bc0f0b0ed6f08fc3e812375b6
Author: mfordjody <[email protected]>
AuthorDate: Mon Oct 14 08:35:28 2024 +0800
[charts] base Installation test completed (#455)
---
manifests/charts/admin/templates/admin/admin-namespace.yaml | 8 --------
manifests/charts/admin/templates/custom/_namespaces.tpl | 11 -----------
.../{admin/crds => base/files}/dubbo.io_conditionroutes.yaml | 0
.../crds => base/files}/dubbo.io_dataplaneinsights.yaml | 0
.../{admin/crds => base/files}/dubbo.io_dataplanes.yaml | 0
.../{admin/crds => base/files}/dubbo.io_datasources.yaml | 0
.../{admin/crds => base/files}/dubbo.io_dynamicconfigs.yaml | 0
.../charts/{admin/crds => base/files}/dubbo.io_mappings.yaml | 0
.../charts/{admin/crds => base/files}/dubbo.io_meshes.yaml | 0
.../{admin/crds => base/files}/dubbo.io_meshinsights.yaml | 0
.../charts/{admin/crds => base/files}/dubbo.io_metadata.yaml | 0
.../charts/{admin/crds => base/files}/dubbo.io_secrets.yaml | 0
.../crds => base/files}/dubbo.io_servicenamemappings.yaml | 0
.../{admin/crds => base/files}/dubbo.io_tagroutes.yaml | 0
.../{admin/crds => base/files}/dubbo.io_zoneegresses.yaml | 0
.../crds => base/files}/dubbo.io_zoneegressinsights.yaml | 0
.../{admin/crds => base/files}/dubbo.io_zoneingresses.yaml | 0
.../crds => base/files}/dubbo.io_zoneingressinsights.yaml | 0
.../{admin/crds => base/files}/dubbo.io_zoneinsights.yaml | 0
.../charts/{admin/crds => base/files}/dubbo.io_zones.yaml | 0
manifests/charts/base/templates/_helpers.tpl | 6 ++++++
manifests/charts/base/templates/crds.yaml | 12 +++++++++++-
manifests/charts/base/templates/namespace.yaml | 4 ++++
manifests/charts/base/values.yaml | 7 ++++++-
24 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/manifests/charts/admin/templates/admin/admin-namespace.yaml
b/manifests/charts/admin/templates/admin/admin-namespace.yaml
deleted file mode 100644
index cfe6d0a3..00000000
--- a/manifests/charts/admin/templates/admin/admin-namespace.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
- name: {{ template "admin.namespace" . }}
- labels:
- {{- include "admin.labels" . | nindent 4 }}
-
-
diff --git a/manifests/charts/admin/templates/custom/_namespaces.tpl
b/manifests/charts/admin/templates/custom/_namespaces.tpl
index db10b5ea..28f884b0 100644
--- a/manifests/charts/admin/templates/custom/_namespaces.tpl
+++ b/manifests/charts/admin/templates/custom/_namespaces.tpl
@@ -1,14 +1,3 @@
-{{/*
-Return Admin Namespace to use.
-*/}}
-{{- define "admin.namespace" -}}
-{{- if .Values.namespaceOverride }}
-{{- .Values.namespaceOverride }}
-{{- else if not (empty .Release.Namespace) -}}
-{{- "dubbo-system" | default }}
-{{- end }}
-{{- end }}
-
{{/*
Return ZooKeeper Namespace to use.
*/}}
diff --git a/manifests/charts/admin/crds/dubbo.io_conditionroutes.yaml
b/manifests/charts/base/files/dubbo.io_conditionroutes.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_conditionroutes.yaml
rename to manifests/charts/base/files/dubbo.io_conditionroutes.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_dataplaneinsights.yaml
b/manifests/charts/base/files/dubbo.io_dataplaneinsights.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_dataplaneinsights.yaml
rename to manifests/charts/base/files/dubbo.io_dataplaneinsights.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_dataplanes.yaml
b/manifests/charts/base/files/dubbo.io_dataplanes.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_dataplanes.yaml
rename to manifests/charts/base/files/dubbo.io_dataplanes.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_datasources.yaml
b/manifests/charts/base/files/dubbo.io_datasources.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_datasources.yaml
rename to manifests/charts/base/files/dubbo.io_datasources.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_dynamicconfigs.yaml
b/manifests/charts/base/files/dubbo.io_dynamicconfigs.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_dynamicconfigs.yaml
rename to manifests/charts/base/files/dubbo.io_dynamicconfigs.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_mappings.yaml
b/manifests/charts/base/files/dubbo.io_mappings.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_mappings.yaml
rename to manifests/charts/base/files/dubbo.io_mappings.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_meshes.yaml
b/manifests/charts/base/files/dubbo.io_meshes.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_meshes.yaml
rename to manifests/charts/base/files/dubbo.io_meshes.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_meshinsights.yaml
b/manifests/charts/base/files/dubbo.io_meshinsights.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_meshinsights.yaml
rename to manifests/charts/base/files/dubbo.io_meshinsights.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_metadata.yaml
b/manifests/charts/base/files/dubbo.io_metadata.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_metadata.yaml
rename to manifests/charts/base/files/dubbo.io_metadata.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_secrets.yaml
b/manifests/charts/base/files/dubbo.io_secrets.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_secrets.yaml
rename to manifests/charts/base/files/dubbo.io_secrets.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_servicenamemappings.yaml
b/manifests/charts/base/files/dubbo.io_servicenamemappings.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_servicenamemappings.yaml
rename to manifests/charts/base/files/dubbo.io_servicenamemappings.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_tagroutes.yaml
b/manifests/charts/base/files/dubbo.io_tagroutes.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_tagroutes.yaml
rename to manifests/charts/base/files/dubbo.io_tagroutes.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zoneegresses.yaml
b/manifests/charts/base/files/dubbo.io_zoneegresses.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zoneegresses.yaml
rename to manifests/charts/base/files/dubbo.io_zoneegresses.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zoneegressinsights.yaml
b/manifests/charts/base/files/dubbo.io_zoneegressinsights.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zoneegressinsights.yaml
rename to manifests/charts/base/files/dubbo.io_zoneegressinsights.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zoneingresses.yaml
b/manifests/charts/base/files/dubbo.io_zoneingresses.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zoneingresses.yaml
rename to manifests/charts/base/files/dubbo.io_zoneingresses.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zoneingressinsights.yaml
b/manifests/charts/base/files/dubbo.io_zoneingressinsights.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zoneingressinsights.yaml
rename to manifests/charts/base/files/dubbo.io_zoneingressinsights.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zoneinsights.yaml
b/manifests/charts/base/files/dubbo.io_zoneinsights.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zoneinsights.yaml
rename to manifests/charts/base/files/dubbo.io_zoneinsights.yaml
diff --git a/manifests/charts/admin/crds/dubbo.io_zones.yaml
b/manifests/charts/base/files/dubbo.io_zones.yaml
similarity index 100%
rename from manifests/charts/admin/crds/dubbo.io_zones.yaml
rename to manifests/charts/base/files/dubbo.io_zones.yaml
diff --git a/manifests/charts/base/templates/_helpers.tpl
b/manifests/charts/base/templates/_helpers.tpl
new file mode 100644
index 00000000..508181af
--- /dev/null
+++ b/manifests/charts/base/templates/_helpers.tpl
@@ -0,0 +1,6 @@
+{{/*
+Return Dubbo Namespace to use.
+*/}}
+{{- define "dubbo.namespace" -}}
+{{- "dubbo-system" | default }}
+{{- end }}
diff --git a/manifests/charts/base/templates/crds.yaml
b/manifests/charts/base/templates/crds.yaml
index 13878a13..25ce230e 100644
--- a/manifests/charts/base/templates/crds.yaml
+++ b/manifests/charts/base/templates/crds.yaml
@@ -11,4 +11,14 @@
# 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.
\ No newline at end of file
+# limitations under the License.
+
+{{- $file := .Files }}
+{{- $crds := .Values.enableCRD }}
+{{- if $crds }}
+{{- range $path, $_ := .Files.Glob "files/**.yaml" }}
+{{- $file.Get $path }}
+{{- end -}}
+{{- end -}}
+
+
diff --git a/manifests/charts/base/templates/namespace.yaml
b/manifests/charts/base/templates/namespace.yaml
new file mode 100644
index 00000000..5bf28a66
--- /dev/null
+++ b/manifests/charts/base/templates/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: {{ template "dubbo.namespace" . }}
\ No newline at end of file
diff --git a/manifests/charts/base/values.yaml
b/manifests/charts/base/values.yaml
index 13878a13..868a5f25 100644
--- a/manifests/charts/base/values.yaml
+++ b/manifests/charts/base/values.yaml
@@ -11,4 +11,9 @@
# 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.
\ No newline at end of file
+# limitations under the License.
+
+base:
+ ## dubboctl disable dubbo configuration crds in base.
+ enableDubboConfigCRD: true
+defaultRevision: "default"
\ No newline at end of file
