[Feature] [SWCK] Add Instrument CRD to config and operate instruments. (

#66) * add agent crd * default remove configmap * add optional plugin e2e case * remove agent overlay annotation * update docs Co-authored-by: 吴晟 Wu Sheng <[email protected]>
apache · Aug 31, 2022 · 7bdb235 · 7bdb235
1 parent aebe9bc
commit 7bdb235
Show file tree

Hide file tree

Showing 76 changed files with 4,145 additions and 567 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -86,6 +86,36 @@ jobs:
  uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205 # always prefer to use a revision instead of `main`.
  with:
  e2e-file: test/e2e/oap-ui-agent/e2e.yaml # need to run E2E file path
+ swagent-e2e-tests:
+ name: e2e tests(oap+ui+swagent)
+ runs-on: ubuntu-latest
+ steps:
+ - name: Install Go
+ uses: actions/setup-go@v2
+ with:
+ go-version: 1.17
+ id: go
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v2
+ - name: Run E2E Test(oap+ui+agent)
+ uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
+ with:
+ e2e-file: test/e2e/oap-ui-swagent/e2e.yaml
+ swagent-configmap-e2e-tests:
+ name: e2e tests(oap+ui+swagent+configmap)
+ runs-on: ubuntu-latest
+ steps:
+ - name: Install Go
+ uses: actions/setup-go@v2
+ with:
+ go-version: 1.17
+ id: go
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v2
+ - name: Run E2E Test(oap+ui+agent+configmap)
+ uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
+ with:
+ e2e-file: test/e2e/oap-ui-swagent-configmap/e2e.yaml
  internel-storage-e2e-tests:
  name: e2e tests(oap+ui+agent+internel-storage)
  runs-on: ubuntu-latest
@@ -173,12 +203,12 @@ jobs:
  - name: Check out code into the Go module directory
  uses: actions/checkout@v2
  - name: Run E2E Test
- uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205 
+ uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
  with:
  e2e-file: test/e2e/oap-ui-agent-oapserverconfig-oapserverdynamicconfig/e2e.yaml
  checks:
  name: build
  runs-on: ubuntu-20.04
- needs: [check, build, unit-tests, e2e-tests, internel-storage-e2e-tests, external-storage-e2e-tests, adapter-hpa-e2e-tests, e2e-tests-with-satellite, adapter-satellite-hpa-e2e-tests, oapserver-configuration-e2e-tests]
+ needs: [check, build, unit-tests, e2e-tests, swagent-e2e-tests, swagent-configmap-e2e-tests, internel-storage-e2e-tests, external-storage-e2e-tests, adapter-hpa-e2e-tests, e2e-tests-with-satellite, adapter-satellite-hpa-e2e-tests, oapserver-configuration-e2e-tests]
  steps:
  - run: echo 'success'
diff --git a/Makefile b/Makefile
@@ -54,13 +54,18 @@ clean: ## Clean project
 ##@ End to End Test
 
 .PHONY:e2e-test
-e2e-test: e2e-oap-ui-agent e2e-oap-ui-agent-storage-internal e2e-oap-agent-adapter-hpa e2e-oap-ui-agent-satellite e2e-oap-agent-satellite-adapter-hpa e2e-oap-ui-agent-oapserverconfig-oapserverdynamicconfig ## Run End to End tests.
+e2e-test: e2e-oap-ui-agent e2e-oap-ui-swagent e2e-oap-ui-agent-storage-internal e2e-oap-agent-adapter-hpa e2e-oap-ui-agent-satellite e2e-oap-agent-satellite-adapter-hpa e2e-oap-ui-agent-oapserverconfig-oapserverdynamicconfig ## Run End to End tests.
 
 .PHONY:e2e-oap-ui-agent
 e2e-oap-ui-agent: e2e ## Run oap+ui+agent test
  @echo "Run oap+ui+agent e2e..."
  $(E2E) run -c test/e2e/oap-ui-agent/e2e.yaml
 
+.PHONY:e2e-oap-ui-swagent
+e2e-oap-ui-swagent: e2e ## Run oap+ui+swagent test
+ @echo "Run oap+ui+swagent e2e..."
+ $(E2E) run -c test/e2e/oap-ui-swagent/e2e.yaml
+
 .PHONY:e2e-oap-ui-agent-storage-internal
 e2e-oap-ui-agent-internal-storage: e2e ## Run oap+ui+agent test
  @echo "Run oap+ui+agent e2e..."