Upgrade ElasticSearch Helm Chart dependency version (#98)

apache · Nov 21, 2022 · 6367b19 · 6367b19
1 parent 5084206
commit 6367b19
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 73 deletions.
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
@@ -46,11 +46,6 @@ jobs:
             oap-tag: cef4f6dcac5b14cd67f51a64ad08052bbc046653
             ui-repo: ghcr.io/apache/skywalking/ui
             ui-tag: cef4f6dcac5b14cd67f51a64ad08052bbc046653
-          - name: 8.6.0
-            oap-repo: skywalking.docker.scarf.sh/apache/skywalking-oap-server
-            oap-tag: 8.6.0-es6
-            ui-repo: skywalking.docker.scarf.sh/apache/skywalking-ui
-            ui-tag: 8.6.0
     name: Istio+Envoy Access Log Service(${{ matrix.images.name }})
     env:
       OAP_TAG: ${{ matrix.images.oap-tag }}

diff --git a/.github/workflows/e2e.compatibility.yaml b/.github/workflows/e2e.compatibility.yaml
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
@@ -31,7 +31,7 @@ maintainers:
 
 dependencies:
   - name: elasticsearch
-    version: ~7.5.1
+    version: ~7.17.1
     repository: https://helm.elastic.co/
     condition: elasticsearch.enabled
   - name: postgresql

diff --git a/chart/skywalking/templates/NOTES.txt b/chart/skywalking/templates/NOTES.txt
@@ -46,7 +46,7 @@ Get the UI URL by running these commands:
   kubectl port-forward svc/{{ include "skywalking.ui.fullname" . }} 8080:{{ .Values.ui.service.externalPort }} --namespace {{ .Release.Namespace }}
 {{- end }}
 
-{{- if.Values.elasticsearch.enabled }}
+{{- if .Values.elasticsearch.enabled }}
 {{- if .Values.elasticsearch.persistence.enabled }}
 {{- else }}
 #################################################################################

diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
@@ -173,10 +173,6 @@ elasticsearch:
   #    secretName: elastic-certificates
   #    path: /usr/share/elasticsearch/config/certs
 
-  image: "docker.elastic.co/elasticsearch/elasticsearch"
-  imageTag: "6.8.6"
-  imagePullPolicy: "IfNotPresent"
-
   podAnnotations: {}
   # iam.amazonaws.com/role: es-cluster