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 24461bf0 [charts] Delete redundant configuration (#649)
24461bf0 is described below
commit 24461bf0f40579a00c9a6ec641fee378631e2357
Author: Jian Zhong <[email protected]>
AuthorDate: Thu Mar 20 13:49:47 2025 +0800
[charts] Delete redundant configuration (#649)
---
manifests/charts/admin/README.md | 4 --
manifests/charts/admin/files/profile-demo.yaml | 14 -----
manifests/charts/admin/templates/certificates.yaml | 2 +-
manifests/charts/admin/templates/deployment.yaml | 66 +++++++++++-----------
manifests/charts/admin/templates/zzz_profile.yaml | 7 ---
manifests/charts/admin/values.yaml | 10 ++--
manifests/charts/base/files/profile-demo.yaml | 14 -----
manifests/charts/base/templates/zzz_profile.yaml | 7 ---
.../nacos/files/profile-demo.yaml | 14 -----
.../register-discovery/nacos/templates/NOTES.txt | 0
.../nacos/templates/zzz_profile.yaml | 7 ---
.../zookeeper/files/profile-demo.yaml | 14 -----
.../zookeeper/templates/NOTES.txt | 0
.../zookeeper/templates/zzz_profile.yaml | 7 ---
14 files changed, 39 insertions(+), 127 deletions(-)
diff --git a/manifests/charts/admin/README.md b/manifests/charts/admin/README.md
index 283c7a98..33733187 100644
--- a/manifests/charts/admin/README.md
+++ b/manifests/charts/admin/README.md
@@ -3,10 +3,6 @@
-## Values
-
-### Dubbo
-
| Key | Description
| Default
|
|--------------------------------------------------|--------------------------------------------------------------------------------------------|-------------------------------------------|
| `auth.enabled` | Auth Status for Admin
Control Plane. | `true`
|
diff --git a/manifests/charts/admin/files/profile-demo.yaml
b/manifests/charts/admin/files/profile-demo.yaml
deleted file mode 100644
index 13878a13..00000000
--- a/manifests/charts/admin/files/profile-demo.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/certificates.yaml
b/manifests/charts/admin/templates/certificates.yaml
index 7e3511e2..1c1c8160 100644
--- a/manifests/charts/admin/templates/certificates.yaml
+++ b/manifests/charts/admin/templates/certificates.yaml
@@ -38,7 +38,7 @@ We only autogenerate certs if the cert is not yet generated.
This way we keep th
apiVersion: v1
kind: Secret
metadata:
- name: {{ $secretName }}
+ name: {{ include "admin.name" . }}-tls-cert
namespace: {{ .Release.Namespace }}
labels: {{ include "admin.labels" . | nindent 4 }}
type: kubernetes.io/tls
diff --git a/manifests/charts/admin/templates/deployment.yaml
b/manifests/charts/admin/templates/deployment.yaml
index 97f5454e..c55591e6 100644
--- a/manifests/charts/admin/templates/deployment.yaml
+++ b/manifests/charts/admin/templates/deployment.yaml
@@ -97,22 +97,22 @@ spec:
{{- if $admin.volumeMounts }}
{{- toYaml $admin.volumeMounts | nindent 8 }}
{{- end }}
- - name: general-tls-cert
- mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.crt
- subPath: tls.crt
- readOnly: true
- - name: general-tls-cert
- mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.key
- subPath: tls.key
- readOnly: true
- - name: general-tls-cert{{- if $cp.tls.caSecretName }}-ca{{- end }}
- mountPath: /var/run/secrets/dubbo.io/tls-cert/ca.crt
- subPath: ca.crt
- readOnly: true
- - name: config
- mountPath: /etc/dubbo.io/config.yaml
- subPath: config.yaml
- readOnly: true
+{{/* - name: general-tls-cert*/}}
+{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.crt*/}}
+{{/* subPath: tls.crt*/}}
+{{/* readOnly: true*/}}
+{{/* - name: general-tls-cert*/}}
+{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.key*/}}
+{{/* subPath: tls.key*/}}
+{{/* readOnly: true*/}}
+{{/* - name: general-tls-cert{{- if $cp.tls.caSecretName }}-ca{{- end
}}*/}}
+{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/ca.crt*/}}
+{{/* subPath: ca.crt*/}}
+{{/* readOnly: true*/}}
+{{/* - name: config*/}}
+{{/* mountPath: /etc/dubbo.io/config.yaml*/}}
+{{/* subPath: config.yaml*/}}
+{{/* readOnly: true*/}}
securityContext:
{{- if $admin.securityContext }}
{{- toYaml $admin.securityContext | nindent 10 }}
@@ -137,23 +137,23 @@ spec:
{{- if $admin.volumes }}
{{- toYaml $admin.volumes | nindent 6 }}
{{- end }}
- - name: config
- configMap:
- name: {{ include "admin.name" . }}-config
- {{- if $cp.tls.secretName }}
- - name: general-tls-cert
- secret:
- secretName: {{ $cp.tls.secretName }}
- {{- else }}
- - name: general-tls-cert
- secret:
- secretName: {{ include "admin.name" . }}-tls-cert
- {{- end }}
- {{- if $cp.tls.caSecretName }}
- - name: general-tls-cert-ca
- secret:
- secretName: {{ $cp.tls.caSecretName }}
- {{- end }}
+{{/* - name: config*/}}
+{{/* configMap:*/}}
+{{/* name: {{ include "admin.name" . }}-config*/}}
+{{/* {{- if $cp.tls.secretName }}*/}}
+{{/* - name: general-tls-cert*/}}
+{{/* secret:*/}}
+{{/* secretName: {{ $cp.tls.secretName }}*/}}
+{{/* {{- else }}*/}}
+{{/* - name: general-tls-cert*/}}
+{{/* secret:*/}}
+{{/* secretName: {{ include "admin.name" . }}-tls-cert*/}}
+{{/* {{- end }}*/}}
+{{/* {{- if $cp.tls.caSecretName }}*/}}
+{{/* - name: general-tls-cert-ca*/}}
+{{/* secret:*/}}
+{{/* secretName: {{ $cp.tls.caSecretName }}*/}}
+{{/* {{- end }}*/}}
- name: storage
{{- if $admin.persistence.enabled }}
persistentVolumeClaim:
diff --git a/manifests/charts/admin/templates/zzz_profile.yaml
b/manifests/charts/admin/templates/zzz_profile.yaml
index 4d4136f5..056b69ee 100644
--- a/manifests/charts/admin/templates/zzz_profile.yaml
+++ b/manifests/charts/admin/templates/zzz_profile.yaml
@@ -6,13 +6,6 @@
{{- $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" .)}}
-{{- $profile = (. | fromYaml) }}
-{{- else }}
-{{ fail (cat "unknown profile" .) }}
-{{- end }}
-{{- end }}
{{- if false }}
{{- $a := mustMergeOverwrite $defaults ($profile.global) ($.Values.global |
default dict) }}
{{- end }}
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 10471838..b1702581 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -40,7 +40,7 @@ _internal_default_values_not_set:
# Source of the container image.
registry: docker.io/apache/dubbo-admin
# Version tag of the container image.
- tag: latest
+ tag: 0.5.0-SNAPSHOT
# Image pull policy, available options are: Always, IfNotPresent, Never.
pullPolicy: IfNotPresent
@@ -174,15 +174,15 @@ _internal_default_values_not_set:
# Maximum CPU and memory resources allowed for the container.
limits:
# CPU usage limit.
- cpu: 1024m
+ cpu: 102m
# Memory usage limit.
- memory: 1Gi
+ memory: 100Mi
# Initial CPU and memory resource requests for the container.
requests:
# CPU usage request.
- cpu: 512m
+ cpu: 102m
# Memory usage request.
- memory: 512Mi
+ memory: 100Mi
## Define toleration's for the application pods.
tolerations: ~
diff --git a/manifests/charts/base/files/profile-demo.yaml
b/manifests/charts/base/files/profile-demo.yaml
deleted file mode 100644
index 13878a13..00000000
--- a/manifests/charts/base/files/profile-demo.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.
\ 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 4d4136f5..056b69ee 100644
--- a/manifests/charts/base/templates/zzz_profile.yaml
+++ b/manifests/charts/base/templates/zzz_profile.yaml
@@ -6,13 +6,6 @@
{{- $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" .)}}
-{{- $profile = (. | fromYaml) }}
-{{- else }}
-{{ fail (cat "unknown profile" .) }}
-{{- end }}
-{{- end }}
{{- if false }}
{{- $a := mustMergeOverwrite $defaults ($profile.global) ($.Values.global |
default dict) }}
{{- end }}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/files/profile-demo.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/files/profile-demo.yaml
deleted file mode 100644
index 13878a13..00000000
---
a/manifests/charts/dubbo-control/register-discovery/nacos/files/profile-demo.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/NOTES.txt
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/NOTES.txt
deleted file mode 100644
index e69de29b..00000000
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
index e5d51a9e..9643fb52 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
@@ -7,13 +7,6 @@
{{- $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" .)}}
-{{- $profile = (. | fromYaml) }}
-{{- else }}
-{{ fail (cat "unknown profile" .) }}
-{{- end }}
-{{- end }}
{{- if false }}
{{- $a := mustMergeOverwrite $defaults ($profile.global) ($.Values.global |
default dict) }}
{{- end }}
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/files/profile-demo.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/files/profile-demo.yaml
deleted file mode 100644
index 13878a13..00000000
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/files/profile-demo.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/NOTES.txt
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/NOTES.txt
deleted file mode 100644
index e69de29b..00000000
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
index 32c3348c..3f87a4b6 100644
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
@@ -6,13 +6,6 @@
{{- $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" .)}}
-{{- $profile = (. | fromYaml) }}
-{{- else }}
-{{ fail (cat "unknown profile" .) }}
-{{- end }}
-{{- end }}
{{- if false }}
{{- $a := mustMergeOverwrite $defaults ($profile.global) ($.Values.global |
default dict) }}
{{- end }}
