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/08 05:48:14 UTC
[skywalking-showcase] branch main updated: Remove E2E and rename UI image env var name (#25)
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 10b8906 Remove E2E and rename UI image env var name (#25)
10b8906 is described below
commit 10b8906962635f7122ce4252b9dbde85313276bd
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Apr 8 13:48:09 2022 +0800
Remove E2E and rename UI image env var name (#25)
---
.github/workflows/go.yml | 43 --------------
Makefile.in | 2 +-
deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
.../docker/docker-compose.single-node.yaml | 2 +-
.../kubernetes/feature-cluster/resources.yaml | 2 +-
.../kubernetes/feature-single-node/resources.yaml | 2 +-
test/e2e/e2e.yaml | 66 ----------------------
test/e2e/kind.yaml | 41 --------------
test/e2e/verify/service.yaml | 61 --------------------
9 files changed, 5 insertions(+), 216 deletions(-)
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
deleted file mode 100644
index 562eec5..0000000
--- a/.github/workflows/go.yml
+++ /dev/null
@@ -1,43 +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: Continuous Integration
-
-on: pull_request
-
-env:
- IMAGE_HUB: ghcr.io/apache/skywalking-showcase
- IMAGE_TAG: ${{ github.sha }}
- TAG: ${{ github.sha }}
-
-jobs:
- e2e-tests:
- name: e2e tests(kubenretes platform)
- runs-on: ubuntu-latest
- steps:
- - name: Install Go
- uses: actions/setup-go@v2
- with:
- go-version: 1.17
- - name: Check out source code
- uses: actions/checkout@v2
- - name: Build Docker Image
- shell: bash
- run: make docker -j 5
- - name: Run E2E Test
- uses: apache/skywalking-infra-e2e@ccb8dd74a8f75d5ee3e59992c219f36aaf0c3944
- with:
- e2e-file: test/e2e/e2e.yaml
diff --git a/Makefile.in b/Makefile.in
index 0cb6733..06883ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,7 +27,7 @@ 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:4e750e69fbe34a9d6e87b4db7dda955a335736db
-SW_ROCKET_BOT_IMAGE ?= ghcr.io/apache/skywalking/ui:4e750e69fbe34a9d6e87b4db7dda955a335736db
+SW_UI_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/docker/docker-compose.cluster.yaml b/deploy/platform/docker/docker-compose.cluster.yaml
index 5accf20..a132420 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -74,7 +74,7 @@ services:
<<: *oap
rocket-bot:
- image: ${SW_ROCKET_BOT_IMAGE}
+ image: ${SW_UI_IMAGE}
networks: [ sw ]
ports:
- "9999:8080"
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml b/deploy/platform/docker/docker-compose.single-node.yaml
index b7e4c72..9445fad 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -59,7 +59,7 @@ services:
condition: service_healthy
rocket-bot:
- image: ${SW_ROCKET_BOT_IMAGE}
+ image: ${SW_UI_IMAGE}
networks: [ sw ]
ports:
- "9999:8080"
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 1b12675..9825319 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -296,7 +296,7 @@ spec:
serviceAccountName: skywalking-oap-sa-cluster
containers:
- name: rocket-bot
- image: ${SW_ROCKET_BOT_IMAGE}
+ image: ${SW_UI_IMAGE}
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 5b1fae9..5a4dde3 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -225,7 +225,7 @@ spec:
spec:
containers:
- name: rocket-bot
- image: ${SW_ROCKET_BOT_IMAGE}
+ image: ${SW_UI_IMAGE}
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/test/e2e/e2e.yaml b/test/e2e/e2e.yaml
deleted file mode 100644
index b10466c..0000000
--- a/test/e2e/e2e.yaml
+++ /dev/null
@@ -1,66 +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.
-
-setup:
- env: kind
- file: ./kind.yaml
- steps:
- - name: prepare e2e.yaml
- command: bash scripts/prepare-e2e.sh
- - name: setup showcase
- command: |
- export KUBECONFIG=$TMPDIR/e2e-k8s.config
- export PATH="$PATH:/tmp/skywalking-infra-e2e/istio-1.9.1/bin"
- make deploy.kubernetes FEATURE_FLAGS=java-agent-injector,single-node
- - name: wait for readiness
- command: sleep 30 # The pods are not even created so waiting for their readiness yields "No maching resources"
- wait:
- - namespace: skywalking-swck-system
- resource: pod
- for: condition=Ready
- - namespace: default
- resource: pod
- for: condition=Ready
- kind:
- import-images:
- - ${IMAGE_HUB}/gateway-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/songs-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/recommendation-service:${IMAGE_TAG}
- - ${IMAGE_HUB}/app:${IMAGE_TAG}
- - ${IMAGE_HUB}/load-gen:${IMAGE_TAG}
- expose-ports:
- - namespace: default
- resource: service/rocket-bot
- port: 8080
- timeout: 20m
-
-trigger:
- action: http
- interval: 10s
- times: 5
- url: http://${service_rocket_bot_host}:${service_rocket_bot_8080}
- method: GET
-
-verify:
- # verify with retry strategy
- retry:
- # max retry count
- count: 20
- # the interval between two attempts, e.g. 10s, 1m.
- interval: 30s
- cases:
- # test service
- - query: swctl --display yaml --base-url=http://${service_rocket_bot_host}:${service_rocket_bot_8080}/graphql service ls
- expected: ./verify/service.yaml
diff --git a/test/e2e/kind.yaml b/test/e2e/kind.yaml
deleted file mode 100644
index fcb7a90..0000000
--- a/test/e2e/kind.yaml
+++ /dev/null
@@ -1,41 +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.
-
-# this config file contains all config fields with comments
-# NOTE: this is not a particularly useful config file
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-# patch the generated kubeadm config with some extra settings
-kubeadmConfigPatches:
-- |
- apiVersion: kubelet.config.k8s.io/v1beta1
- kind: KubeletConfiguration
- evictionHard:
- nodefs.available: "0%"
-# patch it further using a JSON 6902 patch
-kubeadmConfigPatchesJSON6902:
-- group: kubeadm.k8s.io
- version: v1beta2
- kind: ClusterConfiguration
- patch: |
- - op: add
- path: /apiServer/certSANs/-
- value: my-hostname
-# 1 control plane node
-nodes:
-# the control plane node config
-- role: control-plane
- image: kindest/node:v1.19.1
-
diff --git a/test/e2e/verify/service.yaml b/test/e2e/verify/service.yaml
deleted file mode 100644
index a867cd1..0000000
--- a/test/e2e/verify/service.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Licensed to 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. Apache Software Foundation (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.
-
-{{- contains . }}
-- 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: "agent"
- shortname: gateway
- layers:
- - GENERAL
- normal: true
-- id: {{ b64enc "agent::songs" }}.1
- name: agent::songs
- group: "agent"
- shortname: songs
- layers:
- - GENERAL
- normal: true
-- id: {{ b64enc "agent::recommendation" }}.1
- name: agent::recommendation
- group: "agent"
- shortname: recommendation
- layers:
- - GENERAL
- normal: true
-- id: {{ b64enc "agent::app" }}.1
- name: agent::app
- 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 }}