This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 6367b19 Upgrade ElasticSearch Helm Chart dependency version (#98)
6367b19 is described below
commit 6367b19584348cac8aeb78f570e85017f0632052
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Mon Nov 21 14:33:58 2022 +0800
Upgrade ElasticSearch Helm Chart dependency version (#98)
---
.github/workflows/e2e.ci.yaml | 5 ---
.github/workflows/e2e.compatibility.yaml | 62 --------------------------------
chart/skywalking/Chart.yaml | 2 +-
chart/skywalking/templates/NOTES.txt | 2 +-
chart/skywalking/values.yaml | 4 ---
5 files changed, 2 insertions(+), 73 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index 59b4a3e..b8e0f49 100644
--- 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
deleted file mode 100644
index 13b63fe..0000000
--- a/.github/workflows/e2e.compatibility.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Test Compatibility
-
-on:
- pull_request:
- paths:
- - '!**.md'
-
-env:
- ISTIO_VERSION: 1.7.1
- SATELLITE_TAG: v4b97fd255b6459fe9d3fc4f88c0d8f682fc2a364
- SATELLITE_REPO: ghcr.io/apache/skywalking-satellite/skywalking-satellite
-
-jobs:
- als:
- runs-on: ubuntu-latest
- timeout-minutes: 60
- strategy:
- matrix:
- images:
- - 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
- env:
- OAP_TAG: ${{ matrix.images.oap-tag }}
- OAP_REPO: ${{ matrix.images.oap-repo }}
- UI_TAG: ${{ matrix.images.ui-tag }}
- UI_REPO: ${{ matrix.images.ui-repo }}
- name: als_${{ matrix.images.oap-tag }}
- steps:
- - uses: actions/checkout@v2
-
- - name: Setup go
- uses: actions/setup-go@v2
- with:
- go-version: '1.16'
- - name: Run E2E Test
- uses:
apache/skywalking-infra-e2e@45584853d6f660102c523b1e9cb5815d12ae55d3
- with:
- e2e-file: $GITHUB_WORKSPACE/test/e2e/e2e.yaml
- - uses: actions/upload-artifact@v2
- if: ${{ failure() }}
- name: Upload Logs
- with:
- name: logs
- path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index 78ee446..699b431 100644
--- 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
index 87304ff..0f0370d 100644
--- 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
index f228e3d..174eab6 100644
--- 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
