kezhenxu94 commented on a change in pull request #83:
URL:
https://github.com/apache/skywalking-kubernetes/pull/83#discussion_r755734367
##########
File path: chart/skywalking/values.yaml
##########
@@ -373,5 +373,34 @@ elasticsearch:
keystore: []
+satellite:
+ name: satellite
+ replicas: 1
+ enabled: false
+ image:
+ repository: skywalking.docker.scarf.sh/apache/skywalking-satellite
+ tag: null # Must be set explicitly
+ pullPolicy: IfNotPresent
+ ports:
+ grpc: 11800
+ prometheus: 1234
+ service:
+ type: ClusterIP
+ antiAffinity: "soft"
+ nodeAffinity: {}
+ nodeSelector: {}
+ tolerations: []
+ resources: {}
+ # limits:
+ # cpu: 4
+ # memory: 8Gi
+ # requests:
+ # cpu: 4
+ # memory: 4Gi
+ podAnnotations:
+ # example: oap-foo
+ env:
+ # more env, please refer to
https://hub.docker.com/r/apache/skywalking-satellite
Review comment:
There is nothing env can be referred in this link
https://hub.docker.com/r/apache/skywalking-satellite
##########
File path: .github/workflows/e2e.ci.yaml
##########
@@ -43,98 +45,41 @@ jobs:
repository: apache/skywalking
submodules: true
path: main
- ref: 6228d450e1b0792dd9875ad68984c89c81ece742
+ ref: 8436135dc919351a6d0ab42ff48c85e1b3104b53
+ - uses: actions/checkout@v2
+ with:
+ repository: apache/skywalking-satellite
+ submodules: true
+ path: satellite
+ ref: 4b97fd255b6459fe9d3fc4f88c0d8f682fc2a364
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Build Docker Image
+ - name: Build SkyWalking OAP Docker Image
Review comment:
Replace this step with the snapshot docker images from main repo, no
need to build here
##########
File path: .github/workflows/e2e.compatibility.yaml
##########
@@ -18,98 +18,66 @@ name: Test Compatibility
on:
pull_request:
+ push:
Review comment:
We usually don't run workflow on push
##########
File path: .github/workflows/e2e.compatibility.yaml
##########
@@ -18,98 +18,66 @@ name: Test Compatibility
on:
pull_request:
+ push:
paths:
- '!**.md'
+ branches:
+ - master
env:
ISTIO_VERSION: 1.7.1
- SCRIPTS_DIR: main/test/e2e-mesh/e2e-istio/scripts
- SW_OAP_BASE_IMAGE: openjdk:8-jre-alpine
jobs:
als:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
- tag:
- - 8.3.0-es6
+ 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:
- TAG: ${{ matrix.tag }}
- name: ${{ matrix.tag }}
+ 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
- uses: actions/checkout@v2
with:
repository: apache/skywalking
submodules: true
path: main
- ref: 5e4b16cbfc96f80bd86eb6a98ddcf60f0959c9b1
-
- - name: Prepare envrionment
- run: bash ${SCRIPTS_DIR}/pre.sh
-
- - name: Install Minikube
- run: bash ${SCRIPTS_DIR}/minikube.sh start
-
- - name: Install Istio
- run: bash ${SCRIPTS_DIR}/istio.sh --set profile=demo --set
meshConfig.defaultConfig.envoyAccessLogService.address=skywalking-oap.istio-system:11800
--set meshConfig.enableEnvoyAccessLogService=true
-
- - name: Install SkyWalking
- run: |
- cd chart
- helm dep up skywalking
- helm -n istio-system install skywalking skywalking \
- --set fullnameOverride=skywalking \
- --set elasticsearch.replicas=1 \
- --set elasticsearch.minimumMasterNodes=1 \
- --set oap.env.SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS=k8s-mesh \
- --set oap.envoy.als.enabled=true \
- --set oap.replicas=1 \
- --set ui.image.tag=${TAG//-es*} \
- --set oap.image.tag=$TAG \
- --set oap.storageType=elasticsearch
- kubectl -n istio-system get pods
-
- sleep 3
- kubectl -n istio-system wait --for=condition=available
deployments/skywalking-oap --timeout=1200s
- kubectl get pods -A -o wide --show-labels
- kubectl get services -A -o wide
-
- - name: Deploy demo services
- run: bash ${SCRIPTS_DIR}/demo.sh
-
- - name: Cluster Info
- if: ${{ failure() }}
- run: |
- df -h
- minikube logs
- minikube status
+ ref: 8436135dc919351a6d0ab42ff48c85e1b3104b53
+ - uses: actions/checkout@v2
+ with:
+ repository: apache/skywalking-satellite
+ submodules: true
+ path: satellite
+ ref: 4b97fd255b6459fe9d3fc4f88c0d8f682fc2a364
- - name: Set up Minikube tunnel
- run: |
- mkdir /tmp/minikube-tunnel
- minikube tunnel > /tmp/minikube-tunnel/a.log &
- export POD_NAME=$(kubectl get pods -n istio-system -l
"app=skywalking,release=skywalking,component=ui" -o
jsonpath="{.items[0].metadata.name}")
- echo $POD_NAME
- kubectl -n istio-system port-forward $POD_NAME 8080:8080 >
/tmp/minikube-tunnel/b.log &
+ - name: Build SkyWalking Satellite Docker Image
+ run: cd satellite && make docker && cd ..
- - name: Run E2E test
+ - name: Load SkyWalking OAP And UI Image
run: |
- export GATEWAY_HOST=$(minikube ip)
- export GATEWAY_PORT=$(kubectl -n istio-system get service
istio-ingressgateway -o jsonpath='{.spec.ports[?(@.name=="http2")].nodePort}')
- export WEBAPP_HOST=127.0.0.1
- export WEBAPP_PORT=8080
-
- cd main && ./mvnw --batch-mode -f test/e2e/pom.xml -am
-DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.mesh.ALSE2E
+ docker pull $OAP_REPO:$OAP_TAG
+ docker pull $UI_REPO:$UI_TAG
Review comment:
No need to do this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
