You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/11/04 02:09:45 UTC
[skywalking-kubernetes] branch docker created (now 72a624f)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch docker
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
at 72a624f Add doc installing via Docker registry, add publish command
This branch includes the following new commits:
new 72a624f Add doc installing via Docker registry, add publish command
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-kubernetes] 01/01: Add doc installing via Docker registry, add publish command
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
commit 72a624f690f9fa646c765d56ce5505e2b83d536f
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Nov 4 10:09:35 2022 +0800
Add doc installing via Docker registry, add publish command
---
.gitignore | 2 ++
Makefile | 17 ++++++++++-------
README.md | 16 +++++++++++++++-
chart/skywalking/Chart.yaml | 4 ++--
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 79a111b..2f4c86e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
.idea
.vscode
chart/skywalking/charts/
+chart/skywalking/Chart.lock
+*.tgz
diff --git a/Makefile b/Makefile
index ce6fee3..c01775d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@ SHELL = /bin/bash -eo pipefail
CHART_DIR = chart/skywalking
VERSION = $(shell cat ${CHART_DIR}/Chart.yaml | grep -p '^version: ' | awk '{print $$2}')
-CHART_NAME = skywalking-${VERSION}
+CHART_NAME = $(shell cat ${CHART_DIR}/Chart.yaml | grep -p '^name: ' | awk '{print $$2}')
-RELEASE_SRC = skywalking-kubernetes-${VERSION}-src
+RELEASE_SRC = ${CHART_NAME}-${VERSION}-src
prepare:
cp -R NOTICE ${CHART_DIR}/NOTICE
@@ -37,9 +37,9 @@ clean:
rm -rf ${CHART_DIR}/LICENSE \
rm -rf ${CHART_DIR}/Chart.lock \
rm -rf ${CHART_DIR}/charts \
- rm -rf ${CHART_NAME}.tgz \
- rm -rf ${CHART_NAME}.tgz.asc \
- rm -rf ${CHART_NAME}.tgz.sha512 \
+ rm -rf ${CHART_NAME}-${VERSION}.tgz \
+ rm -rf ${CHART_NAME}-${VERSION}.tgz.asc \
+ rm -rf ${CHART_NAME}-${VERSION}.tgz.sha512 \
rm -rf ${RELEASE_SRC}.tgz \
rm -rf ${RELEASE_SRC}.tgz.asc \
rm -rf ${RELEASE_SRC}.tgz.sha512
@@ -57,5 +57,8 @@ release-src:
release: release-src package
gpg --batch --yes --armor --detach-sig $(RELEASE_SRC).tgz
shasum -a 512 $(RELEASE_SRC).tgz > $(RELEASE_SRC).tgz.sha512
- gpg --batch --yes --armor --detach-sig $(CHART_NAME).tgz
- shasum -a 512 $(CHART_NAME).tgz > $(CHART_NAME).tgz.sha512
\ No newline at end of file
+ gpg --batch --yes --armor --detach-sig $(CHART_NAME)-$(VERSION).tgz
+ shasum -a 512 $(CHART_NAME)-$(VERSION).tgz > $(CHART_NAME)-$(VERSION).tgz.sha512
+
+publish: package
+ helm push ${CHART_NAME}-${VERSION}.tgz oci://registry-1.docker.io/apache
diff --git a/README.md b/README.md
index 756a680..0f52a91 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,25 @@ and use `-f <filename>` or `--values=<filename>` to set them.
Let's set some variables for convenient use later.
```shell
+export SKYWALKING_RELEASE_VERSIOIN=4.3.0 # change the release version according to your need
export SKYWALKING_RELEASE_NAME=skywalking # change the release name according to your scenario
export SKYWALKING_RELEASE_NAMESPACE=default # change the namespace to where you want to install SkyWalking
```
-## Install released version using Helm repository
+## Install released version using Docker Helm repository (>= 4.3.0)
+
+```shell
+helm install "${SKYWALKING_RELEASE_NAME}" \
+ oci://registry-1.docker.io/apache/skywalking-helm \
+ --version "${SKYWALKING_RELEASE_VERSIOIN}" \
+ -n "${SKYWALKING_RELEASE_NAMESPACE}" \
+ --set oap.image.tag=9.2.0 \
+ --set oap.storageType=elasticsearch \
+ --set ui.image.tag=9.2.0 \
+ --set elasticsearch.imageTag=6.8.6
+```
+
+## Install released version using Apache Jfrog Helm repository (<= 4.3.0)
```shell
export REPO=skywalking
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index 9e47815..87072cf 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -14,10 +14,10 @@
# limitations under the License.
apiVersion: v2
-name: skywalking
+name: skywalking-helm
home: https://skywalking.apache.org
version: 4.3.0
-description: Apache SkyWalking APM System
+description: Helm Chart for Apache SkyWalking
icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
- https://github.com/apache/skywalking-kubernetes