This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
The following commit(s) were added to refs/heads/main by this push:
new 92b9be5 Bump up Go version in Docker (#146)
92b9be5 is described below
commit 92b9be5e1e32bec65cb51516018e24bb1404b094
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Tue Oct 17 11:24:47 2023 +0800
Bump up Go version in Docker (#146)
---
docker/Dockerfile | 2 +-
test/e2e/case/istio/als/e2e.yaml | 4 +++-
test/e2e/case/istio/metrics/e2e.yaml | 6 ++++--
test/e2e/case/istio/values.yaml | 27 +++++++++++++++++++++++++++
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ac3d024..3f60dd9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.20 as build
+FROM golang:1.21 as build
ARG VERSION="latest"
ARG TARGETARCH
diff --git a/test/e2e/case/istio/als/e2e.yaml b/test/e2e/case/istio/als/e2e.yaml
index 725ed6e..c303fe7 100644
--- a/test/e2e/case/istio/als/e2e.yaml
+++ b/test/e2e/case/istio/als/e2e.yaml
@@ -68,7 +68,9 @@ setup:
--set satellite.enabled=true \
--set
satellite.image.repository=apache/skywalking-satellite \
--set satellite.image.tag=vlatest \
- --set
satellite.env.SATELLITE_GRPC_ACCEPT_LIMIT_CPU_UTILIZATION=100
+ --set
satellite.env.SATELLITE_GRPC_ACCEPT_LIMIT_CPU_UTILIZATION=100 \
+ -f ../../test/e2e/case/istio/values.yaml
+
wait:
- namespace: istio-system
resource: deployments/skywalking-oap
diff --git a/test/e2e/case/istio/metrics/e2e.yaml
b/test/e2e/case/istio/metrics/e2e.yaml
index 4c8b512..0ea3efb 100644
--- a/test/e2e/case/istio/metrics/e2e.yaml
+++ b/test/e2e/case/istio/metrics/e2e.yaml
@@ -78,7 +78,9 @@ setup:
--set satellite.enabled=true \
--set
satellite.image.repository=apache/skywalking-satellite \
--set satellite.image.tag=vlatest \
- --set
satellite.env.SATELLITE_GRPC_ACCEPT_LIMIT_CPU_UTILIZATION=100
+ --set
satellite.env.SATELLITE_GRPC_ACCEPT_LIMIT_CPU_UTILIZATION=100 \
+ -f ../../test/e2e/case/istio/values.yaml
+
wait:
- namespace: istio-system
resource: deployments/skywalking-oap
@@ -216,4 +218,4 @@ verify:
# dependency service
- query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
dependency service --service-name=e2e::productpage
- expected: expected/dependency-services-productpage.yml
\ No newline at end of file
+ expected: expected/dependency-services-productpage.yml
diff --git a/test/e2e/case/istio/values.yaml b/test/e2e/case/istio/values.yaml
new file mode 100644
index 0000000..c9a2bf2
--- /dev/null
+++ b/test/e2e/case/istio/values.yaml
@@ -0,0 +1,27 @@
+# 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.
+
+elasticsearch:
+ esConfig:
+ elasticsearch.yml: |
+ cluster.routing.allocation.disk.threshold_enabled: false
+ volumeClaimTemplate:
+ accessModes: [ "ReadWriteOnce" ]
+ resources:
+ requests:
+ storage: 2Gi
+ persistence:
+ enabled: true
+
