You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/04/06 13:44:33 UTC
[skywalking-showcase] branch main updated: Update oap/ui images (#20)
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-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 8ad52cc Update oap/ui images (#20)
8ad52cc is described below
commit 8ad52cca54040330fd51db2771dbadd240e1dfbc
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Apr 6 21:44:28 2022 +0800
Update oap/ui images (#20)
---
.github/workflows/go.yml | 2 +-
Makefile.in | 4 +--
deploy/platform/kubernetes/Makefile.in | 2 +-
scripts/prepare-e2e.sh | 8 +++---
test/e2e/e2e.yaml | 5 ----
test/e2e/verify/service.yaml | 50 +++++++++++++++++++++++-----------
6 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index f6ecabe..562eec5 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -38,6 +38,6 @@ jobs:
shell: bash
run: make docker -j 5
- name: Run E2E Test
- uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
+ uses: apache/skywalking-infra-e2e@ccb8dd74a8f75d5ee3e59992c219f36aaf0c3944
with:
e2e-file: test/e2e/e2e.yaml
diff --git a/Makefile.in b/Makefile.in
index c006782..98e10a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,8 +26,8 @@ TAG ?= $(shell git rev-parse --short HEAD)
ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.0
-SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:74fbc3d8ecce103eeefc2a7e52b3d369b0b2c956
-SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:74fbc3d8ecce103eeefc2a7e52b3d369b0b2c956
+SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:4e750e69fbe34a9d6e87b4db7dda955a335736db
+SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:4e750e69fbe34a9d6e87b4db7dda955a335736db
SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:8c5725f2c4c47de6091748c1b4747f0d6047ad8e
SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/Makefile.in b/deploy/platform/kubernetes/Makefile.in
index 4a47a8e..eb30dc7 100644
--- a/deploy/platform/kubernetes/Makefile.in
+++ b/deploy/platform/kubernetes/Makefile.in
@@ -21,4 +21,4 @@
NAMESPACE ?= default
AGENTLESS ?= false
-FEATURE_FLAGS ?= agent,cluster,kubernetes-monitor,so11y,vm,als,event,istiod-monitor
+FEATURE_FLAGS ?= java-agent-injector,cluster,kubernetes-monitor,so11y,vm,als,event,istiod-monitor
diff --git a/scripts/prepare-e2e.sh b/scripts/prepare-e2e.sh
index 7aacb2a..7eaab63 100755
--- a/scripts/prepare-e2e.sh
+++ b/scripts/prepare-e2e.sh
@@ -25,7 +25,7 @@ TEMP_DIR=/tmp/skywalking-infra-e2e
KUBECTL_VERSION=v1.19.1
ISTIOCTL_VERSION=1.9.1
-SWCTL_VERSION=0.9.0
+SWCTL_VERSION=76ffc9a70bfeb30526f30dd532fd617ae5da48d0
prepare_ok=true
# install kubectl
@@ -57,8 +57,8 @@ function install_istioctl()
function install_swctl()
{
if ! command -v swctl &> /dev/null; then
- cd $TEMP_DIR && wget https://github.com/apache/skywalking-cli/archive/0.9.0.tar.gz -O - |\
- tar xz && cd skywalking-cli-${SWCTL_VERSION} && make ${OS} && mv bin/swctl-*-${OS}-amd64 ${INSTALL_DIR}/swctl
+ cd $TEMP_DIR && wget https://github.com/apache/skywalking-cli/archive/${SWCTL_VERSION}.tar.gz -O - |\
+ tar xz && cd skywalking-cli-${SWCTL_VERSION} && make install DESTDIR=${INSTALL_DIR}
if [ $? -ne 0 ]; then
echo "install swctl error, please check"
prepare_ok=false
@@ -80,4 +80,4 @@ function install_all()
fi
}
-install_all
\ No newline at end of file
+install_all
diff --git a/test/e2e/e2e.yaml b/test/e2e/e2e.yaml
index f81d027..b10466c 100644
--- a/test/e2e/e2e.yaml
+++ b/test/e2e/e2e.yaml
@@ -36,15 +36,10 @@ setup:
kind:
import-images:
- ${IMAGE_HUB}/gateway-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/gateway-service:${IMAGE_TAG}-agentless
- ${IMAGE_HUB}/songs-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/songs-service:${IMAGE_TAG}-agentless
- ${IMAGE_HUB}/recommendation-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/recommendation-service:${IMAGE_TAG}-agentless
- ${IMAGE_HUB}/app:${IMAGE_TAG}
- - ${IMAGE_HUB}/app:${IMAGE_TAG}-agentless
- ${IMAGE_HUB}/load-gen:${IMAGE_TAG}
- - ${IMAGE_HUB}/load-gen:${IMAGE_TAG}-agentless
expose-ports:
- namespace: default
resource: service/rocket-bot
diff --git a/test/e2e/verify/service.yaml b/test/e2e/verify/service.yaml
index 221fa49..a867cd1 100644
--- a/test/e2e/verify/service.yaml
+++ b/test/e2e/verify/service.yaml
@@ -16,28 +16,46 @@
# under the License.
{{- contains . }}
-- id: {{ b64enc "agentless::gateway" }}.1
- name: agentless::gateway
- group: ""
-- id: {{ b64enc "agentless::songs" }}.1
- name: agentless::songs
- group: ""
-- id: {{ b64enc "agentless::recommendation" }}.1
- name: agentless::recommendation
- group: ""
-- id: {{ b64enc "agentless::app" }}.1
- name: agentless::app
+- id: {{ b64enc "localhost:-1" }}.0
+ name: localhost:-1
group: ""
+ shortname: localhost:-1
+ layers:
+ - VIRTUAL_DATABASE
+ normal: false
- id: {{ b64enc "agent::gateway" }}.1
name: agent::gateway
- group: ""
+ group: "agent"
+ shortname: gateway
+ layers:
+ - GENERAL
+ normal: true
- id: {{ b64enc "agent::songs" }}.1
name: agent::songs
- group: ""
+ group: "agent"
+ shortname: songs
+ layers:
+ - GENERAL
+ normal: true
- id: {{ b64enc "agent::recommendation" }}.1
name: agent::recommendation
- group: ""
+ group: "agent"
+ shortname: recommendation
+ layers:
+ - GENERAL
+ normal: true
- id: {{ b64enc "agent::app" }}.1
name: agent::app
- group: ""
-{{- end }}
\ No newline at end of file
+ group: "agent"
+ shortname: app
+ layers:
+ - GENERAL
+ normal: true
+- id: {{ b64enc "agent::ui" }}.1
+ name: agent::ui
+ group: "agent"
+ shortname: ui
+ layers:
+ - BROWSER
+ normal: true
+{{- end }}