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 f0457c74 [charts] Update charts naming readability (#529)
f0457c74 is described below
commit f0457c748140890e85a4a3c8178358c2a113ea01
Author: Jian Zhong <[email protected]>
AuthorDate: Sun Jan 12 15:36:33 2025 +0800
[charts] Update charts naming readability (#529)
---
manifests/charts/admin/Chart.yaml | 4 +-
.../{admin-certificates.yaml => certificates.yaml} | 0
.../admin/{admin-configmap.yaml => configmap.yaml} | 0
.../{admin-deployment.yaml => deployment.yaml} | 0
...admin-networkpolicy.yaml => networkpolicy.yaml} | 0
...volumeclaim.yaml => persistentvolumeclaim.yaml} | 0
...ruptionbudget.yaml => poddisruptionbudget.yaml} | 0
...dsecuritypolicy.yaml => podsecuritypolicy.yaml} | 0
.../templates/admin/{admin-rbac.yaml => rbac.yaml} | 0
.../admin/{admin-service.yaml => service.yaml} | 0
.../{admin-statefulset.yaml => statefulset.yaml} | 0
.../{ingress/ingress-dep.yaml => deployment.yaml} | 0
.../exposer/{ingress => }/ingress-class.yaml | 0
.../templates/exposer/{ingress => }/ingress.yaml | 0
.../{ingress/ingress-rbac.yaml => rbac.yaml} | 0
.../admin/templates/{jobs.yaml => extra-push.yaml} | 72 +---------------------
.../nacos/{nacos-configmap.yaml => configmap.yaml} | 0
.../nacos/{nacos-service.yaml => service.yaml} | 0
.../{nacos-statefulset.yaml => statefulset.yaml} | 0
.../{zookeeper-configmap.yaml => configmap.yaml} | 0
.../{zookeeper-service.yaml => service.yaml} | 0
...zookeeper-statefulset.yaml => statefulset.yaml} | 0
.../{traffic-authority.yaml => authority.yaml} | 0
.../traffic/{traffic-config.yaml => config.yaml} | 0
.../traffic/{traffic-rbac.yaml => rbac.yaml} | 0
manifests/charts/admin/values.yaml | 5 --
26 files changed, 4 insertions(+), 77 deletions(-)
diff --git a/manifests/charts/admin/Chart.yaml
b/manifests/charts/admin/Chart.yaml
index 34d05ef6..0cc91a24 100644
--- a/manifests/charts/admin/Chart.yaml
+++ b/manifests/charts/admin/Chart.yaml
@@ -25,8 +25,8 @@ appVersion: 0.1.0
kubeVersion: '>=1.28.0-0'
maintainers:
- - name: mfordjody
- email: [email protected]
+- name: mfordjody
+ email: [email protected]
sources:
- https://github.com/apache/dubbo-kubernetes
diff --git a/manifests/charts/admin/templates/admin/admin-certificates.yaml
b/manifests/charts/admin/templates/admin/certificates.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-certificates.yaml
rename to manifests/charts/admin/templates/admin/certificates.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-configmap.yaml
b/manifests/charts/admin/templates/admin/configmap.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-configmap.yaml
rename to manifests/charts/admin/templates/admin/configmap.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-deployment.yaml
b/manifests/charts/admin/templates/admin/deployment.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-deployment.yaml
rename to manifests/charts/admin/templates/admin/deployment.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-networkpolicy.yaml
b/manifests/charts/admin/templates/admin/networkpolicy.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-networkpolicy.yaml
rename to manifests/charts/admin/templates/admin/networkpolicy.yaml
diff --git
a/manifests/charts/admin/templates/admin/admin-persistentvolumeclaim.yaml
b/manifests/charts/admin/templates/admin/persistentvolumeclaim.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/admin/admin-persistentvolumeclaim.yaml
rename to manifests/charts/admin/templates/admin/persistentvolumeclaim.yaml
diff --git
a/manifests/charts/admin/templates/admin/admin-poddisruptionbudget.yaml
b/manifests/charts/admin/templates/admin/poddisruptionbudget.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/admin/admin-poddisruptionbudget.yaml
rename to manifests/charts/admin/templates/admin/poddisruptionbudget.yaml
diff --git
a/manifests/charts/admin/templates/admin/admin-podsecuritypolicy.yaml
b/manifests/charts/admin/templates/admin/podsecuritypolicy.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-podsecuritypolicy.yaml
rename to manifests/charts/admin/templates/admin/podsecuritypolicy.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-rbac.yaml
b/manifests/charts/admin/templates/admin/rbac.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-rbac.yaml
rename to manifests/charts/admin/templates/admin/rbac.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-service.yaml
b/manifests/charts/admin/templates/admin/service.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-service.yaml
rename to manifests/charts/admin/templates/admin/service.yaml
diff --git a/manifests/charts/admin/templates/admin/admin-statefulset.yaml
b/manifests/charts/admin/templates/admin/statefulset.yaml
similarity index 100%
rename from manifests/charts/admin/templates/admin/admin-statefulset.yaml
rename to manifests/charts/admin/templates/admin/statefulset.yaml
diff --git a/manifests/charts/admin/templates/exposer/ingress/ingress-dep.yaml
b/manifests/charts/admin/templates/exposer/deployment.yaml
similarity index 100%
rename from manifests/charts/admin/templates/exposer/ingress/ingress-dep.yaml
rename to manifests/charts/admin/templates/exposer/deployment.yaml
diff --git
a/manifests/charts/admin/templates/exposer/ingress/ingress-class.yaml
b/manifests/charts/admin/templates/exposer/ingress-class.yaml
similarity index 100%
rename from manifests/charts/admin/templates/exposer/ingress/ingress-class.yaml
rename to manifests/charts/admin/templates/exposer/ingress-class.yaml
diff --git a/manifests/charts/admin/templates/exposer/ingress/ingress.yaml
b/manifests/charts/admin/templates/exposer/ingress.yaml
similarity index 100%
rename from manifests/charts/admin/templates/exposer/ingress/ingress.yaml
rename to manifests/charts/admin/templates/exposer/ingress.yaml
diff --git a/manifests/charts/admin/templates/exposer/ingress/ingress-rbac.yaml
b/manifests/charts/admin/templates/exposer/rbac.yaml
similarity index 100%
rename from manifests/charts/admin/templates/exposer/ingress/ingress-rbac.yaml
rename to manifests/charts/admin/templates/exposer/rbac.yaml
diff --git a/manifests/charts/admin/templates/jobs.yaml
b/manifests/charts/admin/templates/extra-push.yaml
similarity index 59%
rename from manifests/charts/admin/templates/jobs.yaml
rename to manifests/charts/admin/templates/extra-push.yaml
index 1a7e4c31..835e6348 100644
--- a/manifests/charts/admin/templates/jobs.yaml
+++ b/manifests/charts/admin/templates/extra-push.yaml
@@ -1,7 +1,5 @@
{{- $jobs := .Values.jobs -}}
-{{- $mesh := .Values.mesh }}
{{- $prom := .Values.kubePrometheus }}
-{{- $jaeger := .Values.jaeger }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -12,20 +10,6 @@ metadata:
annotations:
{{- include "jobs.env.annotations" . | nindent 4 }}
data:
- {{- if (eq $mesh true) }}
- kubectl.sh: |-
- #!/bin/bash
-
- set -eux
-
- WORKDIR=$(dirname "$0")
- WORKDIR=$(cd "$WORKDIR"; pwd)
- {{- if .Values.jaeger.enabled }}
-
JAEGER="https://raw.githubusercontent.com/istio/istio/release-1.23/samples/addons/jaeger.yaml";
- kubectl apply -f $JAEGER
- {{- end }}
- kubectl get namespace istio-system >/dev/null 2>&1 || kubectl create
namespace istio-system
- {{- end }}
helm.sh: |-
#!/bin/bash
set -eux
@@ -51,65 +35,13 @@ data:
helm install {{ include "prom.name" . }} "./{{ include "prom.stack.name" .
}}/" -n dubbo-system
fi
{{- end }}
- {{- if (eq $mesh true) }}
- ISTIO="https://istio-release.storage.googleapis.com/charts";
- helm repo add istio "$ISTIO" && \
- helm repo update && \
- helm install istio-base istio/base -n istio-system --set
defaultRevision=default && \
- helm install istiod istio/istiod -n istio-system
- {{- end }}
dubbo-resources-metrics.yaml: |-
{{- .Files.Get "files/dashboards/dubbo-resources-metrics.yaml" | nindent 4
}}
---
apiVersion: batch/v1
kind: Job
metadata:
- name: dubbo-job-create-1
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- include "jobs.labels" . | nindent 4 }}
- annotations:
- {{- include "jobs.1.annotations" . | nindent 4 }}
-spec:
- template:
- metadata:
- name: dubbo-job-create-1
- spec:
- serviceAccountName: job-sa
- restartPolicy: {{ $jobs.restartPolicy }}
- dnsPolicy: None
- dnsConfig:
- nameservers:
- - 8.8.8.8
- searches:
- - default.svc.cluster.local
- - svc.cluster.local
- - cluster.local
- containers:
- - name: kubectl
- image: "{{ $jobs.image.registry }}:{{ $jobs.image.tag }}"
- imagePullPolicy: "{{ $jobs.image.pullPolicy }}"
- command:
- - "/bin/sh"
- - "-c"
- - "sh /files/kubectl.sh"
- volumeMounts:
- - name: scripts
- mountPath: /files/kubectl.sh
- subPath: kubectl.sh
- - name: scripts
- mountPath: /files/dashboards/dubbo-resources-metrics.yaml
- subPath: dubbo-resources-metrics.yaml
- volumes:
- - name: scripts
- configMap:
- name: jobs-env
- defaultMode: 0755
----
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: dubbo-job-create-2
+ name: dubbo-job-create
namespace: {{ template "admin.namespace" . }}
labels:
{{- include "jobs.labels" . | nindent 4 }}
@@ -118,7 +50,7 @@ metadata:
spec:
template:
metadata:
- name: dubbo-job-create-2
+ name: dubbo-job-create
spec:
serviceAccountName: job-sa
restartPolicy: {{ $jobs.restartPolicy }}
diff --git
a/manifests/charts/admin/templates/register/nacos/nacos-configmap.yaml
b/manifests/charts/admin/templates/register/nacos/configmap.yaml
similarity index 100%
rename from manifests/charts/admin/templates/register/nacos/nacos-configmap.yaml
rename to manifests/charts/admin/templates/register/nacos/configmap.yaml
diff --git a/manifests/charts/admin/templates/register/nacos/nacos-service.yaml
b/manifests/charts/admin/templates/register/nacos/service.yaml
similarity index 100%
rename from manifests/charts/admin/templates/register/nacos/nacos-service.yaml
rename to manifests/charts/admin/templates/register/nacos/service.yaml
diff --git
a/manifests/charts/admin/templates/register/nacos/nacos-statefulset.yaml
b/manifests/charts/admin/templates/register/nacos/statefulset.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/register/nacos/nacos-statefulset.yaml
rename to manifests/charts/admin/templates/register/nacos/statefulset.yaml
diff --git
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-configmap.yaml
b/manifests/charts/admin/templates/register/zookeeper/configmap.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/register/zookeeper/zookeeper-configmap.yaml
rename to manifests/charts/admin/templates/register/zookeeper/configmap.yaml
diff --git
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
b/manifests/charts/admin/templates/register/zookeeper/service.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/register/zookeeper/zookeeper-service.yaml
rename to manifests/charts/admin/templates/register/zookeeper/service.yaml
diff --git
a/manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
b/manifests/charts/admin/templates/register/zookeeper/statefulset.yaml
similarity index 100%
rename from
manifests/charts/admin/templates/register/zookeeper/zookeeper-statefulset.yaml
rename to manifests/charts/admin/templates/register/zookeeper/statefulset.yaml
diff --git a/manifests/charts/admin/templates/traffic/traffic-authority.yaml
b/manifests/charts/admin/templates/traffic/authority.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/traffic-authority.yaml
rename to manifests/charts/admin/templates/traffic/authority.yaml
diff --git a/manifests/charts/admin/templates/traffic/traffic-config.yaml
b/manifests/charts/admin/templates/traffic/config.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/traffic-config.yaml
rename to manifests/charts/admin/templates/traffic/config.yaml
diff --git a/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
b/manifests/charts/admin/templates/traffic/rbac.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/traffic-rbac.yaml
rename to manifests/charts/admin/templates/traffic/rbac.yaml
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 05ee106c..f2b6fd56 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -456,11 +456,6 @@ kubePrometheus:
## Choose between Register and Mesh. If you select Register, then choose
between Zookeeper and Nacos; if not specified, the default is Nacos.
register: true
-## Choose between Register and Mesh. If you select Mesh, then install the
Istiod control plane and the Jaeger component.
-mesh: false
-## The installation will only occur if the Mesh mode is enabled.
-jaeger:
- enabled: true
zookeeper:
## Whether to enable the zookeeper.
