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 2023/04/13 02:09:02 UTC
[skywalking-showcase] 01/01: Add alias for Charts that contains -
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch alias
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit ce9071cdd76fe5d0902635f3f9637332b33dfa06
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Apr 13 10:08:53 2023 +0800
Add alias for Charts that contains -
---
deploy/platform/kubernetes/Chart.yaml | 2 ++
deploy/platform/kubernetes/templates/NOTES.txt | 20 ++++++++++----------
deploy/platform/kubernetes/templates/_helpers.tpl | 12 ++++++------
deploy/platform/kubernetes/values.yaml | 4 ++--
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/deploy/platform/kubernetes/Chart.yaml b/deploy/platform/kubernetes/Chart.yaml
index 3a8e4e8..a525e16 100644
--- a/deploy/platform/kubernetes/Chart.yaml
+++ b/deploy/platform/kubernetes/Chart.yaml
@@ -23,11 +23,13 @@ sources:
- https://github.com/apache/skywalking-showcase
dependencies:
- name: skywalking-helm
+ alias: skywalking
version: 0.0.0-8c143d7203ef3ed0e067646390609d0db06a2cc9
repository: oci://ghcr.io/apache/skywalking-kubernetes
# @feature: java-agent-injector; the java agent injector is a component of the swck operator, so we need to deploy the swck operator firstly
- name: skywalking-helm-swck-operator
+ alias: swck
version: 0.0.0-8c143d7203ef3ed0e067646390609d0db06a2cc9
repository: oci://ghcr.io/apache/skywalking-kubernetes
condition: features.javaAgentInjector.enabled
diff --git a/deploy/platform/kubernetes/templates/NOTES.txt b/deploy/platform/kubernetes/templates/NOTES.txt
index bbed9c2..8b35be5 100644
--- a/deploy/platform/kubernetes/templates/NOTES.txt
+++ b/deploy/platform/kubernetes/templates/NOTES.txt
@@ -26,26 +26,26 @@ Thank you for installing {{ .Chart.Name }}.
Your release is named {{ .Release.Name }}.
Get the UI URL by running these commands:
-{{- if index .Values "skywalking-helm" "ui" "ingress" "enabled" }}
-{{- range index .Values "skywalking-helm" "ui" "ingress" "hosts" }}
- http{{ if index $.Values "ui" "ingress" "tls" }}s{{ end }}://{{ . }}{{ index $.Values "ui" "ingress" "path" }}
+{{- if .Values.skywalking.ui.ingress.enabled }}
+{{- range .Values.skywalking.ui.ingress.hosts }}
+ http{{ if $.Values.skywalking.ui.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.skywalking.ui.ingress.path }}
{{- end }}
-{{- else if contains "NodePort" (index .Values "skywalking-helm" "ui" "service" "type") }}
+{{- else if contains "NodePort" .Values.skywalking.ui.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "skywalking.ui.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" (index .Values "skywalking-helm" "ui" "service" "type") }}
+{{- else if contains "LoadBalancer" .Values.skywalking.ui.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get svc -w {{ include "skywalking.ui.fullname" . }} -n {{ .Release.Namespace }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "skywalking.ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ index .Values "skywalking-helm" "ui" "service" "externalPort" }}
-{{- else if contains "ClusterIP" (index .Values "skywalking-helm" "ui" "service" "type") }}
+ echo http://$SERVICE_IP:{{ .Values.skywalking.ui.service.externalPort }}
+{{- else if contains "ClusterIP" .Values.skywalking.ui.service.type }}
echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward svc/{{ printf "%s-ui" .Release.Name }} 8080:{{ index .Values "skywalking-helm" "ui" "service" "externalPort" }} --namespace {{ .Release.Namespace }}
+ kubectl port-forward svc/{{ printf "%s-ui" .Release.Name }} 8080:{{ .Values.skywalking.ui.service.externalPort }} --namespace {{ .Release.Namespace }}
{{- end }}
-{{- if index .Values "skywalking-helm" "elasticsearch" "enabled" }}
-{{- if index .Values "skywalking-helm" "elasticsearch" "persistence" "enabled" }}
+{{- if .Values.skywalking.elasticsearch.enabled }}
+{{- if .Values.skywalking.elasticsearch.persistence.enabled }}
{{- else }}
#################################################################################
###### WARNING: Persistence is disabled!!! You will lose your data when #####
diff --git a/deploy/platform/kubernetes/templates/_helpers.tpl b/deploy/platform/kubernetes/templates/_helpers.tpl
index 71044fa..b05fa54 100644
--- a/deploy/platform/kubernetes/templates/_helpers.tpl
+++ b/deploy/platform/kubernetes/templates/_helpers.tpl
@@ -19,21 +19,21 @@ limitations under the License.
The collector address, might be OAP or Satellite
*/}}
{{- define "skywalking.collector.address" -}}
-{{- if index .Values "skywalking-helm" "satellite" "enabled" }}
-{{- printf "%s-satellite.%s.svc.cluster.local:%d" (index .Values "skywalking-helm" "fullnameOverride") .Release.Namespace 11800 }}
+{{- if .Values.skywalking.satellite.enabled }}
+{{- printf "%s-satellite.%s.svc.cluster.local:%d" .Values.skywalking.fullnameOverride .Release.Namespace 11800 }}
{{- else }}
-{{- printf "%s-oap.%s.svc.cluster.local:%d" (index .Values "skywalking-helm" "fullnameOverride") .Release.Namespace 11800 }}
+{{- printf "%s-oap.%s.svc.cluster.local:%d" .Values.skywalking.fullnameOverride .Release.Namespace 11800 }}
{{- end -}}
{{- end -}}
{{- define "skywalking.oap.address.host" -}}
-{{- printf "%s-oap.%s.svc.cluster.local" (index .Values "skywalking-helm" "fullnameOverride") .Release.Namespace }}
+{{- printf "%s-oap.%s.svc.cluster.local" .Values.skywalking.fullnameOverride .Release.Namespace }}
{{- end -}}
{{- define "skywalking.oap.address.grpc" -}}
-{{- printf "%s-oap.%s.svc.cluster.local:%d" (index .Values "skywalking-helm" "fullnameOverride") .Release.Namespace 11800 }}
+{{- printf "%s-oap.%s.svc.cluster.local:%d" .Values.skywalking.fullnameOverride .Release.Namespace 11800 }}
{{- end -}}
{{- define "skywalking.oap.address.http" -}}
-{{- printf "http://%s-oap.%s.svc.cluster.local:%d" (index .Values "skywalking-helm" "fullnameOverride") .Release.Namespace 12800 }}
+{{- printf "http://%s-oap.%s.svc.cluster.local:%d" .Values.skywalking.fullnameOverride .Release.Namespace 12800 }}
{{- end -}}
diff --git a/deploy/platform/kubernetes/values.yaml b/deploy/platform/kubernetes/values.yaml
index 2f30a73..31d45d5 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-skywalking-helm:
+skywalking:
fullnameOverride: "sw-demo"
oap:
name: oap
@@ -141,7 +141,7 @@ sampleServices:
namespace: sample-services
# @feature: java-agent-injector; the java agent injector is a component of the swck operator, so we need to deploy the swck operator firstly
-skywalking-helm-swck-operator:
+swck:
image:
repository: ~
tag: ~