This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/refactor-with-go by this push:
new 2577ec72 update addons (#1071)
2577ec72 is described below
commit 2577ec729fe9ba363b9ac1d24edaac0214508bec
Author: Mford Jody <[email protected]>
AuthorDate: Tue Apr 4 10:30:09 2023 +0800
update addons (#1071)
---
deploy/addons/{addons.sh => env.sh} | 52 +++++++++++-----------
.../{values-sw.yaml => values-skywalking.yaml} | 23 +++++-----
.../{values-sw.yaml => values-zookeeper.yaml} | 23 +++++-----
3 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/deploy/addons/addons.sh b/deploy/addons/env.sh
similarity index 62%
rename from deploy/addons/addons.sh
rename to deploy/addons/env.sh
index 5b3bf042..8c627be5 100644
--- a/deploy/addons/addons.sh
+++ b/deploy/addons/env.sh
@@ -16,50 +16,48 @@
# limitations under the License.
WORKDIR=$(dirname "$0")
-DASHBOARDS="${WORKDIR}/dashboards"
+DASHBOARDS=${WORKDIR}
+
+
+# Set up zookeeper
+helm template zookeeper zookeeper \
+ --namespace default \
+ --version 11.1.6 \
+ --repo https://charts.bitnami.com/bitnami \
+ -f "${WORKDIR}/values-zookeeper.yaml" \
+
# Set up prometheus
-helm3 template prometheus prometheus \
+helm template prometheus prometheus \
--namespace default \
--version 20.0.2 \
--repo https://prometheus-community.github.io/helm-charts \
-f "${WORKDIR}/values-prometheus.yaml" \
-function extraDashboard() {
- < "${DASHBOARDS}/$1" jq -c > "${TMP}/$1"
-}
# Set up grafana
-{
- helm3 template grafana grafana \
- --namespace default \
- --version 6.52.4 \
- --repo https://grafana.github.io/helm-charts \
- -f "${WD}/values-grafana.yaml"
+helm template grafana grafana \
+ --namespace default \
+ --version 6.52.4 \
+ --repo https://grafana.github.io/helm-charts \
+ -f "${WORKDIR}/values-grafana.yaml"
- extraDashboard "external-dashboard.json"
+kubectl create configmap -n default admin-extra-dashboards \
+ --dry-run=client -oyaml \
+
--from-file=extra-dashboard.json="${DASHBOARDS}/dashboards/external-dashboard.json"
- kubectl create configmap -n default external-dashboard \
- --dry-run=client -oyaml \
- --from-file=external-dashboard.json="${TMP}/external-dashboard.json" \
-}
-# Set up sw
-{
- helm3 template skywalking skywalking \
+# Set up skywalking
+helm template skywalking skywalking \
--namespace default \
--version 4.3.0 \
--repo https://apache.jfrog.io/artifactory/skywalking-helm \
- -f "${WORKDIR}/values-sw.yaml"
-}
+ -f "${WORKDIR}/values-skywalking.yaml"
+
# Set up zipkin
-{
- helm3 template zipkin zipkin \
+helm template zipkin zipkin \
--namespace default \
--version 0.3.0 \
--repo https://openzipkin.github.io/zipkin \
- -f "${WORKDIR}/values-zipkin.yaml"
-}
-
-
+ -f "${WORKDIR}/values-zipkin.yaml"
\ No newline at end of file
diff --git a/deploy/addons/values-sw.yaml b/deploy/addons/values-skywalking.yaml
similarity index 73%
copy from deploy/addons/values-sw.yaml
copy to deploy/addons/values-skywalking.yaml
index 7676e140..4aedc5f3 100644
--- a/deploy/addons/values-sw.yaml
+++ b/deploy/addons/values-skywalking.yaml
@@ -13,16 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-skywalking:
- enabled: true
- oap:
- image:
- repository: skywalking.docker.scarf.sh/apache/skywalking-oap-server
+oap:
+ image:
+ repository: skywalking.docker.scarf.sh/apache/skywalking-oap-server
tag: 9.3.0
- storageType: elasticsearch
- ui:
- image:
- repository: skywalking.docker.scarf.sh/apache/skywalking-ui
- tag: 9.3.0
- elasticsearch:
- enabled: false
\ No newline at end of file
+ storageType: elasticsearch
+ui:
+ image:
+ repository: skywalking.docker.scarf.sh/apache/skywalking-ui
+ tag: 9.3.0
+
+elasticsearch:
+ enabled: false
\ No newline at end of file
diff --git a/deploy/addons/values-sw.yaml b/deploy/addons/values-zookeeper.yaml
similarity index 73%
rename from deploy/addons/values-sw.yaml
rename to deploy/addons/values-zookeeper.yaml
index 7676e140..bddf2149 100644
--- a/deploy/addons/values-sw.yaml
+++ b/deploy/addons/values-zookeeper.yaml
@@ -13,16 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-skywalking:
+containerSecurityContext:
enabled: true
- oap:
- image:
- repository: skywalking.docker.scarf.sh/apache/skywalking-oap-server
- tag: 9.3.0
- storageType: elasticsearch
- ui:
- image:
- repository: skywalking.docker.scarf.sh/apache/skywalking-ui
- tag: 9.3.0
- elasticsearch:
- enabled: false
\ No newline at end of file
+podSecurityContext:
+ enabled: true
+serviceAccount:
+ create: false
+persistence:
+ enabled: false
+pdb:
+ create: false
+
+
