Bump up several components. (#78)
* Bump up several components.
* Bump up golang to v1.19.
* Bump up golangci-lint to v1.50.0.
* Bump up skywalking-java-agent to v8.13.0.
* Bump up kustomize to v4.5.6.
* Bump up SkyWalking OAP to 9.2.0.
* Fix errors in banyandb e2e test.
Signed-off-by: dashanji <dashanjic@gmail.com>
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index e498c7c..dfa489d 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -32,12 +32,12 @@
runs-on: ubuntu-20.04
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Check License
uses: apache/skywalking-eyes/header@501a28d2fb4a9b962661987e50cf0219631b32ff
- name: Check
@@ -47,11 +47,11 @@
runs-on: ubuntu-20.04
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Build
run: make build
- name: Build docker image
@@ -61,12 +61,12 @@
runs-on: ubuntu-20.04
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: "install kubebuilder"
run: ./hack/install-kubebuilder.sh
- name: tests
@@ -76,12 +76,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test(oap+ui+agent)
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205 # always prefer to use a revision instead of `main`.
with:
@@ -91,12 +91,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test(oap+ui+agent)
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -106,12 +106,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test(oap+ui+agent+configmap)
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -121,12 +121,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -136,12 +136,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -151,12 +151,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -166,12 +166,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -181,12 +181,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -196,12 +196,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
@@ -211,12 +211,12 @@
runs-on: ubuntu-latest
steps:
- name: Install Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v3
with:
- go-version: 1.17
+ go-version: 1.19
id: go
- name: Check out code into the Go module directory
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
diff --git a/CHANGES.md b/CHANGES.md
index 74e2dab..d6ea3d9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,21 @@
==================
Release Notes.
+0.8.0
+------------------
+
+#### Features
+
+#### Bugs
+- Fix errors in banyandb e2e test.
+
+#### Chores
+- Bump up golang to v1.19.
+- Bump up golangci-lint to v1.50.0.
+- Bump up skywalking-java-agent to v8.13.0.
+- Bump up kustomize to v4.5.6.
+- Bump up SkyWalking OAP to 9.2.0.
+
0.7.0
------------------
diff --git a/adapter/Dockerfile b/adapter/Dockerfile
index 9612f50..bf72aca 100644
--- a/adapter/Dockerfile
+++ b/adapter/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
# Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
WORKDIR /workspace
# Copy the Go Modules manifests
diff --git a/adapter/dist/LICENSE b/adapter/dist/LICENSE
index a9ecff4..3571e2d 100644
--- a/adapter/dist/LICENSE
+++ b/adapter/dist/LICENSE
@@ -9,139 +9,56 @@
Apache-2.0 licenses
========================================================================
- cloud.google.com/go v0.81.0 Apache-2.0
- cloud.google.com/go/bigquery v1.8.0 Apache-2.0
- cloud.google.com/go/datastore v1.1.0 Apache-2.0
- cloud.google.com/go/firestore v1.1.0 Apache-2.0
- cloud.google.com/go/pubsub v1.3.1 Apache-2.0
- cloud.google.com/go/storage v1.10.0 Apache-2.0
- github.com/Azure/go-autorest v14.2.0+incompatible Apache-2.0
- github.com/Azure/go-autorest/autorest v0.11.18 Apache-2.0
- github.com/Azure/go-autorest/autorest/adal v0.9.13 Apache-2.0
- github.com/Azure/go-autorest/autorest/date v0.3.0 Apache-2.0
- github.com/Azure/go-autorest/autorest/mocks v0.4.1 Apache-2.0
- github.com/Azure/go-autorest/logger v0.2.1 Apache-2.0
- github.com/Azure/go-autorest/tracing v0.6.0 Apache-2.0
- github.com/Masterminds/goutils v1.1.0 Apache-2.0
github.com/NYTimes/gziphandler v1.1.1 Apache-2.0
- github.com/OneOfOne/xxhash v1.2.2 Apache-2.0
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f Apache-2.0
- github.com/apache/skywalking-cli/gen-codes/skywalking/network v0.0.0-20210209032327-04a0ce08990f Apache-2.0
- github.com/apache/skywalking-swck v0.2.0 Apache-2.0
- github.com/census-instrumentation/opencensus-proto v0.2.1 Apache-2.0
- github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 Apache-2.0
- github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed Apache-2.0
- github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 Apache-2.0
- github.com/cockroachdb/errors v1.2.4 Apache-2.0
- github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f Apache-2.0
- github.com/coreos/etcd v3.3.13+incompatible Apache-2.0
- github.com/coreos/go-oidc v2.1.0+incompatible Apache-2.0
github.com/coreos/go-semver v0.3.0 Apache-2.0
- github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e Apache-2.0
github.com/coreos/go-systemd/v22 v22.3.2 Apache-2.0
- github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f Apache-2.0
- github.com/docker/go-units v0.4.0 Apache-2.0
- github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 Apache-2.0
- github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0 Apache-2.0
- github.com/envoyproxy/protoc-gen-validate v0.1.0 Apache-2.0
- github.com/gdamore/encoding v1.0.0 Apache-2.0
- github.com/gdamore/tcell v1.3.0 Apache-2.0
github.com/go-logr/logr v1.2.0 Apache-2.0
- github.com/go-logr/zapr v1.2.0 Apache-2.0
- github.com/go-openapi/analysis v0.19.5 Apache-2.0
- github.com/go-openapi/errors v0.19.2 Apache-2.0
github.com/go-openapi/jsonpointer v0.19.5 Apache-2.0
github.com/go-openapi/jsonreference v0.19.6 Apache-2.0
- github.com/go-openapi/loads v0.19.4 Apache-2.0
- github.com/go-openapi/runtime v0.19.4 Apache-2.0
- github.com/go-openapi/spec v0.19.3 Apache-2.0
- github.com/go-openapi/strfmt v0.19.3 Apache-2.0
github.com/go-openapi/swag v0.19.15 Apache-2.0
- github.com/go-openapi/validate v0.19.5 Apache-2.0
- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b Apache-2.0
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da Apache-2.0
- github.com/golang/mock v1.5.0 Apache-2.0
- github.com/google/btree v1.0.1 Apache-2.0
github.com/google/gnostic v0.6.9 Apache-2.0
github.com/google/gofuzz v1.1.0 Apache-2.0
- github.com/google/martian v2.1.0+incompatible Apache-2.0
- github.com/google/martian/v3 v3.1.0 Apache-2.0
- github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5 Apache-2.0
- github.com/google/renameio v0.1.0 Apache-2.0
- github.com/googleapis/gnostic v0.5.1 Apache-2.0
- github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 Apache-2.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 Apache-2.0
github.com/inconshreveable/mousetrap v1.0.0 Apache-2.0
- github.com/jonboulle/clockwork v0.2.2 Apache-2.0
- github.com/kubernetes-sigs/custom-metrics-apiserver v0.0.0-20201110135240-8c12d6d92362 Apache-2.0
- github.com/kylelemons/godebug v1.1.0 Apache-2.0
github.com/machinebox/graphql v0.2.2 Apache-2.0
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 Apache-2.0
- github.com/moby/spdystream v0.2.0 Apache-2.0
- github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 Apache-2.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd Apache-2.0
github.com/modern-go/reflect2 v1.0.2 Apache-2.0
- github.com/mum4k/termdash v0.12.1 Apache-2.0
- github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f Apache-2.0
- github.com/oklog/ulid v1.3.1 Apache-2.0
- github.com/opentracing/opentracing-go v1.1.0 Apache-2.0
- github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 Apache-2.0
github.com/prometheus/client_golang v1.12.1 Apache-2.0
github.com/prometheus/client_model v0.2.0 Apache-2.0
github.com/prometheus/common v0.32.1 Apache-2.0
github.com/prometheus/procfs v0.7.3 Apache-2.0
- github.com/prometheus/tsdb v0.7.1 Apache-2.0
- github.com/soheilhy/cmux v0.1.5 Apache-2.0
- github.com/spf13/afero v1.6.0 Apache-2.0
github.com/spf13/cobra v1.4.0 Apache-2.0
- github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f Apache-2.0
- github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 Apache-2.0
- github.com/xeipuuv/gojsonschema v1.2.0 Apache-2.0
- go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 Apache-2.0
go.etcd.io/etcd/api/v3 v3.5.1 Apache-2.0
go.etcd.io/etcd/client/pkg/v3 v3.5.1 Apache-2.0
- go.etcd.io/etcd/client/v2 v2.305.0 Apache-2.0
go.etcd.io/etcd/client/v3 v3.5.1 Apache-2.0
- go.etcd.io/etcd/pkg/v3 v3.5.0 Apache-2.0
- go.etcd.io/etcd/raft/v3 v3.5.0 Apache-2.0
- go.etcd.io/etcd/server/v3 v3.5.0 Apache-2.0
- go.mongodb.org/mongo-driver v1.1.2 Apache-2.0
- go.opencensus.io v0.23.0 Apache-2.0
go.opentelemetry.io/contrib v0.20.0 Apache-2.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 Apache-2.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 Apache-2.0
go.opentelemetry.io/otel v0.20.0 Apache-2.0
go.opentelemetry.io/otel/exporters/otlp v0.20.0 Apache-2.0
go.opentelemetry.io/otel/metric v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/oteltest v0.20.0 Apache-2.0
go.opentelemetry.io/otel/sdk v0.20.0 Apache-2.0
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 Apache-2.0
go.opentelemetry.io/otel/sdk/metric v0.20.0 Apache-2.0
go.opentelemetry.io/otel/trace v0.20.0 Apache-2.0
go.opentelemetry.io/proto/otlp v0.7.0 Apache-2.0
- gomodules.xyz/jsonpatch/v2 v2.1.0 Apache-2.0
google.golang.org/appengine v1.6.7 Apache-2.0
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 Apache-2.0
google.golang.org/grpc v1.40.0 Apache-2.0
- gopkg.in/ini.v1 v1.51.0 Apache-2.0
- gopkg.in/square/go-jose.v2 v2.2.2 Apache-2.0
gopkg.in/yaml.v2 v2.4.0 Apache-2.0
- gotest.tools v2.2.0+incompatible Apache-2.0
- gotest.tools/v3 v3.0.3 Apache-2.0
k8s.io/api v0.24.3 Apache-2.0
- k8s.io/apiextensions-apiserver v0.20.1 Apache-2.0
k8s.io/apimachinery v0.24.3 Apache-2.0
k8s.io/apiserver v0.24.3 Apache-2.0
k8s.io/client-go v0.24.3 Apache-2.0
- k8s.io/code-generator v0.24.3 Apache-2.0
k8s.io/component-base v0.24.3 Apache-2.0
- k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 Apache-2.0
k8s.io/klog/v2 v2.70.1 Apache-2.0
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 Apache-2.0
k8s.io/metrics v0.24.3 Apache-2.0
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed Apache-2.0
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 Apache-2.0
- sigs.k8s.io/controller-runtime v0.7.0 Apache-2.0
sigs.k8s.io/custom-metrics-apiserver v1.24.0 Apache-2.0
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 Apache-2.0
@@ -155,59 +72,26 @@
BSD-2-Clause licenses
========================================================================
- github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 BSD-2-Clause
- github.com/godbus/dbus/v5 v5.0.4 BSD-2-Clause
- github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 BSD-2-Clause
- github.com/gorilla/websocket v1.4.2 BSD-2-Clause
- github.com/magiconair/properties v1.8.1 BSD-2-Clause
github.com/pkg/errors v0.9.1 BSD-2-Clause
- github.com/pkg/sftp v1.10.1 BSD-2-Clause
github.com/russross/blackfriday/v2 v2.1.0 BSD-2-Clause
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f BSD-2-Clause
========================================================================
BSD-3-Clause licenses
========================================================================
- dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 BSD-3-Clause
- github.com/DATA-DOG/go-sqlmock v1.3.3 BSD-3-Clause
github.com/PuerkitoBio/purell v1.1.1 BSD-3-Clause
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 BSD-3-Clause
- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 BSD-3-Clause
- github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 BSD-3-Clause
github.com/evanphx/json-patch v4.12.0+incompatible BSD-3-Clause
github.com/fsnotify/fsnotify v1.4.9 BSD-3-Clause
- github.com/getsentry/raven-go v0.2.0 BSD-3-Clause
- github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 BSD-3-Clause
- github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 BSD-3-Clause
github.com/gogo/protobuf v1.3.2 BSD-3-Clause
github.com/golang/protobuf v1.5.2 BSD-3-Clause
github.com/google/go-cmp v0.5.5 BSD-3-Clause
github.com/google/uuid v1.1.2 BSD-3-Clause
- github.com/googleapis/gax-go/v2 v2.0.5 BSD-3-Clause
- github.com/gorilla/mux v1.8.0 BSD-3-Clause
github.com/grpc-ecosystem/grpc-gateway v1.16.0 BSD-3-Clause
- github.com/hashicorp/go-msgpack v0.5.3 BSD-3-Clause
- github.com/hashicorp/go.net v0.0.1 BSD-3-Clause
- github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 BSD-3-Clause
github.com/imdario/mergo v0.3.10 BSD-3-Clause
- github.com/julienschmidt/httprouter v1.3.0 BSD-3-Clause
- github.com/kr/fs v0.1.0 BSD-3-Clause
- github.com/miekg/dns v1.0.14 BSD-3-Clause
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 BSD-3-Clause
- github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f BSD-3-Clause
- github.com/pborman/uuid v1.2.0 BSD-3-Clause
- github.com/pmezard/go-difflib v1.0.0 BSD-3-Clause
- github.com/rogpeppe/fastuuid v1.2.0 BSD-3-Clause
- github.com/rogpeppe/go-internal v1.3.0 BSD-3-Clause
- github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 BSD-3-Clause
github.com/spf13/pflag v1.0.5 BSD-3-Clause
golang.org/x/crypto v0.3.0 BSD-3-Clause
- golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 BSD-3-Clause
- golang.org/x/image v0.0.0-20190802002840-cff245a6509b BSD-3-Clause
- golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 BSD-3-Clause
- golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 BSD-3-Clause
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 BSD-3-Clause
golang.org/x/net v0.2.0 BSD-3-Clause
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 BSD-3-Clause
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 BSD-3-Clause
@@ -215,30 +99,8 @@
golang.org/x/term v0.2.0 BSD-3-Clause
golang.org/x/text v0.4.0 BSD-3-Clause
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 BSD-3-Clause
- golang.org/x/tools v0.1.12 BSD-3-Clause
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 BSD-3-Clause
- google.golang.org/api v0.43.0 BSD-3-Clause
google.golang.org/protobuf v1.27.1 BSD-3-Clause
- gopkg.in/cheggaaa/pb.v1 v1.0.25 BSD-3-Clause
- gopkg.in/errgo.v2 v2.1.0 BSD-3-Clause
- gopkg.in/fsnotify.v1 v1.4.7 BSD-3-Clause
gopkg.in/inf.v0 v0.9.1 BSD-3-Clause
- gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 BSD-3-Clause
- rsc.io/binaryregexp v0.2.0 BSD-3-Clause
- rsc.io/quote/v3 v3.1.0 BSD-3-Clause
- rsc.io/sampler v1.3.0 BSD-3-Clause
-
-========================================================================
-BSD-3-Clause and GooglePatentClause licenses
-========================================================================
-
- github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 BSD-3-Clause and GooglePatentClause
-
-========================================================================
-CC0-1.0 licenses
-========================================================================
-
- github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c CC0-1.0
========================================================================
ISC licenses
@@ -250,121 +112,22 @@
MIT licenses
========================================================================
- github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 MIT
- github.com/BurntSushi/toml v0.3.1 MIT
- github.com/Masterminds/semver/v3 v3.1.0 MIT
- github.com/Masterminds/sprig/v3 v3.1.0 MIT
- github.com/agnivade/levenshtein v1.0.1 MIT
- github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d MIT
- github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 MIT
- github.com/antihax/optional v1.0.0 MIT
- github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e MIT
- github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da MIT
- github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 MIT
- github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 MIT
- github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a MIT
- github.com/benbjohnson/clock v1.1.0 MIT
github.com/beorn7/perks v1.0.1 MIT
- github.com/bgentry/speakeasy v0.1.0 MIT
- github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c MIT
- github.com/blang/semver v3.5.1+incompatible MIT
github.com/blang/semver/v4 v4.0.0 MIT
- github.com/buger/jsonparser v1.1.1 MIT
- github.com/cespare/xxhash v1.1.0 MIT
github.com/cespare/xxhash/v2 v2.1.2 MIT
- github.com/chzyer/logex v1.1.10 MIT
- github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e MIT
- github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 MIT
- github.com/client9/misspell v0.3.4 MIT
- github.com/coreos/bbolt v1.3.2 MIT
github.com/cpuguy83/go-md2man/v2 v2.0.1 MIT
- github.com/creack/pty v1.1.11 MIT
- github.com/dgrijalva/jwt-go v3.2.0+incompatible MIT
- github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 MIT
- github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 MIT
- github.com/dustin/go-humanize v1.0.0 MIT
github.com/emicklei/go-restful v2.16.0+incompatible MIT
github.com/emicklei/go-restful-swagger12 v0.0.0-20201014110547-68ccff494617 MIT
- github.com/fatih/color v1.7.0 MIT
github.com/felixge/httpsnoop v1.0.1 MIT
- github.com/flowstack/go-jsonschema v0.1.1 MIT
- github.com/form3tech-oss/jwt-go v3.2.3+incompatible MIT
- github.com/getkin/kin-openapi v0.76.0 MIT
- github.com/gizak/termui/v3 v3.1.0 MIT
- github.com/go-kit/kit v0.9.0 MIT
- github.com/go-kit/log v0.1.0 MIT
- github.com/go-logfmt/logfmt v0.5.0 MIT
- github.com/go-stack/stack v1.8.0 MIT
- github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 MIT
- github.com/hashicorp/go-syslog v1.0.0 MIT
- github.com/hashicorp/mdns v1.0.0 MIT
- github.com/hpcloud/tail v1.0.0 MIT
- github.com/huandu/xstrings v1.3.1 MIT
github.com/josharian/intern v1.0.0 MIT
- github.com/jpillora/backoff v1.0.0 MIT
github.com/json-iterator/go v1.1.12 MIT
- github.com/jstemmer/go-junit-report v0.9.1 MIT
- github.com/jtolds/gls v4.20.0+incompatible MIT
- github.com/kisielk/errcheck v1.5.0 MIT
- github.com/kisielk/gotool v1.0.0 MIT
- github.com/konsorten/go-windows-terminal-sequences v1.0.3 MIT
- github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 MIT
- github.com/kr/pretty v0.2.0 MIT
- github.com/kr/pty v1.1.5 MIT
- github.com/kr/text v0.2.0 MIT
- github.com/lucasb-eyer/go-colorful v1.0.2 MIT
github.com/mailru/easyjson v0.7.6 MIT
- github.com/matryer/is v1.4.0 MIT
- github.com/mattn/go-colorable v0.0.9 MIT
- github.com/mattn/go-isatty v0.0.4 MIT
- github.com/mattn/go-runewidth v0.0.9 MIT
- github.com/mitchellh/copystructure v1.0.0 MIT
- github.com/mitchellh/go-homedir v1.1.0 MIT
- github.com/mitchellh/go-testing-interface v1.0.0 MIT
- github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 MIT
- github.com/mitchellh/iochan v1.0.0 MIT
- github.com/mitchellh/mapstructure v1.4.0 MIT
- github.com/mitchellh/reflectwalk v1.0.0 MIT
- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e MIT
- github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be MIT
- github.com/nxadm/tail v1.4.4 MIT
- github.com/olekukonko/tablewriter v0.0.2 MIT
- github.com/onsi/ginkgo v1.14.1 MIT
- github.com/onsi/gomega v1.10.2 MIT
- github.com/pelletier/go-toml v1.2.0 MIT
- github.com/peterbourgon/diskv v2.0.1+incompatible MIT
- github.com/posener/complete v1.1.1 MIT
- github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f MIT
- github.com/sergi/go-diff v1.0.0 MIT
- github.com/shurcooL/sanitized_anchor_name v1.0.0 MIT
github.com/sirupsen/logrus v1.8.1 MIT
- github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d MIT
- github.com/smartystreets/goconvey v1.6.4 MIT
- github.com/spf13/cast v1.3.1 MIT
- github.com/spf13/jwalterweatherman v1.0.0 MIT
- github.com/spf13/viper v1.7.0 MIT
- github.com/stoewer/go-strcase v1.2.0 MIT
- github.com/stretchr/objx v0.2.0 MIT
- github.com/stretchr/testify v1.8.0 MIT
- github.com/subosito/gotenv v1.2.0 MIT
- github.com/tidwall/pretty v1.0.0 MIT
- github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 MIT
- github.com/ugorji/go v1.1.4 MIT
github.com/urfave/cli v1.22.1 MIT
- github.com/vektah/gqlparser v1.1.2 MIT
- github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 MIT
- github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 MIT
- github.com/yuin/goldmark v1.4.1 MIT
- go.etcd.io/bbolt v1.3.6 MIT
go.uber.org/atomic v1.7.0 MIT
- go.uber.org/goleak v1.1.10 MIT
go.uber.org/multierr v1.6.0 MIT
- go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee MIT
go.uber.org/zap v1.19.0 MIT
- gopkg.in/alecthomas/kingpin.v2 v2.2.6 MIT
gopkg.in/natefinch/lumberjack.v2 v2.0.0 MIT
- gopkg.in/resty.v1 v1.12.0 MIT
- honnef.co/go/tools v0.0.1-2020.1.4 MIT
========================================================================
MIT and Apache-2.0 licenses
@@ -376,30 +139,5 @@
MIT and BSD-3-Clause licenses
========================================================================
- github.com/ghodss/yaml v1.0.0 MIT and BSD-3-Clause
- github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 MIT and BSD-3-Clause
sigs.k8s.io/yaml v1.2.0 MIT and BSD-3-Clause
-========================================================================
-MPL-2.0 licenses
-========================================================================
-
- github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 MPL-2.0
- github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 MPL-2.0
- github.com/hashicorp/consul/api v1.1.0 MPL-2.0
- github.com/hashicorp/consul/sdk v0.1.1 MPL-2.0
- github.com/hashicorp/errwrap v1.0.0 MPL-2.0
- github.com/hashicorp/go-cleanhttp v0.5.1 MPL-2.0
- github.com/hashicorp/go-immutable-radix v1.0.0 MPL-2.0
- github.com/hashicorp/go-multierror v1.0.0 MPL-2.0
- github.com/hashicorp/go-rootcerts v1.0.0 MPL-2.0
- github.com/hashicorp/go-sockaddr v1.0.0 MPL-2.0
- github.com/hashicorp/go-uuid v1.0.1 MPL-2.0
- github.com/hashicorp/golang-lru v0.5.4 MPL-2.0
- github.com/hashicorp/hcl v1.0.0 MPL-2.0
- github.com/hashicorp/logutils v1.0.0 MPL-2.0
- github.com/hashicorp/memberlist v0.1.3 MPL-2.0
- github.com/hashicorp/serf v0.8.2 MPL-2.0
- github.com/mitchellh/cli v1.0.0 MPL-2.0
- github.com/mitchellh/gox v0.4.0 MPL-2.0
-
diff --git a/adapter/go.mod b/adapter/go.mod
index 030ad13..45c5001 100644
--- a/adapter/go.mod
+++ b/adapter/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-swck/adapter
-go 1.17
+go 1.19
require (
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f
diff --git a/adapter/go.sum b/adapter/go.sum
index 87c6576..a3a2e23 100644
--- a/adapter/go.sum
+++ b/adapter/go.sum
@@ -94,7 +94,6 @@
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f h1:DknnvUn5ZR1hRtS42stGr3O6REwBFh6iyotoCJ2jFZ8=
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f/go.mod h1:EMKZ5MAEnCrNTPxqWu3s1QgnoUDQEO0oS+ohNB09JE8=
github.com/apache/skywalking-cli/gen-codes/skywalking/network v0.0.0-20210209032327-04a0ce08990f/go.mod h1:kacAwfQjKgotVA/J4v4LZLo682UCOb1AktGep9oDDxw=
-github.com/apache/skywalking-swck v0.2.0 h1:/D4EZQxHWc4CEvCr0YuYMxrzz/Qmmh7+LRYk6cyEbzA=
github.com/apache/skywalking-swck v0.2.0/go.mod h1:kU75U5Tb3aEi1Vk1KX7hzyh8Hv7sUMNx0Djq5PLEPWI=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -113,7 +112,6 @@
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
@@ -121,7 +119,6 @@
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -146,7 +143,6 @@
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -611,16 +607,13 @@
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -644,7 +637,6 @@
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@@ -777,7 +769,6 @@
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -831,8 +822,6 @@
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -932,9 +921,6 @@
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1025,9 +1011,7 @@
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/docs/examples/java-agent-injector-usage.md b/docs/examples/java-agent-injector-usage.md
index d85cebc..5667351 100644
--- a/docs/examples/java-agent-injector-usage.md
+++ b/docs/examples/java-agent-injector-usage.md
@@ -164,7 +164,7 @@
selector:
javaSidecar:
name: swagent-demo
- image: apache/skywalking-java-agent:8.10.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
@@ -231,7 +231,7 @@
&& ls | grep -E "webflux|cloud-gateway-2.1.x" | xargs -i cp {} /sky/agent/plugins/
command:
- sh
- image: apache/skywalking-java-agent:8.10.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
name: swagent-demo
volumeMounts:
- mountPath: /sky/agent
@@ -339,7 +339,7 @@
-i cp {} /sky/agent/plugins/
command:
- sh
- image: apache/skywalking-java-agent:8.10.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
name: inject-skywalking-agent
volumeMounts:
- mountPath: /sky/agent
diff --git a/docs/examples/storage.md b/docs/examples/storage.md
index a0a66da..d425b8d 100644
--- a/docs/examples/storage.md
+++ b/docs/examples/storage.md
@@ -84,9 +84,9 @@
metadata:
name: default
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.0.0
+ image: apache/skywalking-oap-server:9.2.0
service:
template:
type: ClusterIP
diff --git a/docs/java-agent-injector.md b/docs/java-agent-injector.md
index b4dd6b8..8e8950f 100644
--- a/docs/java-agent-injector.md
+++ b/docs/java-agent-injector.md
@@ -104,7 +104,7 @@
- mkdir -p /sky/agent && cp -r /skywalking/agent/* /sky/agent
command:
- sh
- image: apache/skywalking-java-agent:8.10.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
name: inject-skywalking-agent
volumeMounts:
- mountPath: /sky/agent
@@ -134,7 +134,7 @@
selector:
javaSidecar:
name: swagent-demo
- image: apache/skywalking-java-agent:8.10.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
@@ -166,7 +166,7 @@
|------------------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------|
| javaSidecar | javaSidecar is the configs for init container, which holds agent sdk and take agent sdk to the target containers. | |
| javaSidecar.name | the name of the init container. | inject-skywalking-agent |
-| javaSidecar.image | the image of the init container. | apache/skywalking-java-agent:8.8.0-java8 |
+| javaSidecar.image | the image of the init container. | apache/skywalking-java-agent:8.13.0-java8 |
| SharedVolumeName | SharedVolume is the name of an empty volume which shared by initContainer and target containers. | sky-agent |
| SwConfigMapVolume | SwConfigMapVolume defines the configmap which contains agent.config | no default value |
| OptionalPlugins | Select the optional plugin which needs to be moved to the directory(/plugins). Such as `trace`,`webflux`,`cloud-gateway-2.1.x`. | no default value |
@@ -224,7 +224,7 @@
| Annotation key | Description | Annotation Default value |
| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
| `sidecar.skywalking.apache.org/initcontainer.Name` | The name of the injected java agent container. | `inject-skywalking-agent` |
-| `sidecar.skywalking.apache.org/initcontainer.Image` | The container image of the injected java agent container. | `apache/skywalking-java-agent:8.10.0-java8` |
+| `sidecar.skywalking.apache.org/initcontainer.Image` | The container image of the injected java agent container. | `apache/skywalking-java-agent:8.13.0-java8` |
| `sidecar.skywalking.apache.org/initcontainer.Command` | The command of the injected java agent container. | `sh` |
| `sidecar.skywalking.apache.org/initcontainer.args.Option` | The args option of the injected java agent container. | `-c` |
| `sidecar.skywalking.apache.org/initcontainer.args.Command` | The args command of the injected java agent container. | `mkdir -p /sky/agent && cp -r /skywalking/agent/* /sky/agent` |
diff --git a/docs/oapserver-configuration.md b/docs/oapserver-configuration.md
index 3ce1cda..405361f 100644
--- a/docs/oapserver-configuration.md
+++ b/docs/oapserver-configuration.md
@@ -11,7 +11,7 @@
| Field Name | Description |
| ---------- | ------------------------------------------------------------ |
-| Version | The version of OAP server, the default value is 9.0.0 |
+| Version | The version of OAP server, the default value is 9.2.0 |
| Env | The environment variable of OAP server |
| File | The static file in OAP Server, which contains three fields`file.path`、`file.name` and `file.data`. The `file.path` plus the `file.name` is the real file that needs to be replaced in the container image, and the `file.data` is the final data in the specific file. |
@@ -41,7 +41,7 @@
namespace: skywalking-system
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The env configuration of OAPServer
env:
- name: JAVA_OPTS
@@ -110,7 +110,7 @@
| Field Name | Description |
| ------------- | ------------------------------------------------------ |
-| Version | The version of the OAP server, the default value is 9.0.0 |
+| Version | The version of the OAP server, the default value is 9.2.0 |
| LabelSelector | The label selector of the specific configmap, the default value is "app=collector,release=skywalking" |
| Data | All configurations' key and value |
@@ -143,7 +143,7 @@
name: oapserverdynamicconfig-sample
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The labelselector of OAPServer's dynamic configuration, it should be the same as labelSelector of OAPServerConfig
labelSelector: app=collector,release=skywalking
data:
@@ -250,7 +250,7 @@
name: agent-analyzer.default
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The labelselector of OAPServer's dynamic configuration, it should be the same as labelSelector of OAPServerConfig
labelSelector: app=collector,release=skywalking
data:
@@ -267,7 +267,7 @@
name: core.default.endpoint-name-grouping-openapi
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The labelselector of OAPServer's dynamic configuration, it should be the same as labelSelector of OAPServerConfig
labelSelector: app=collector,release=skywalking
data:
diff --git a/hack/build/module.mk b/hack/build/module.mk
index a844375..d1081c4 100644
--- a/hack/build/module.mk
+++ b/hack/build/module.mk
@@ -23,6 +23,10 @@
include $(root_dir)/hack/build/base.mk
+CONTROLLER_GEN_VERSION := v0.7.0
+KUSTOMIZE_VERSION := v4.5.6
+GOLANGCI_LINT_VERSION := v1.50.0
+
##@ Code quality and integrity
# The goimports tool does not arrange imports in 3 blocks if there are already more than three blocks.
@@ -53,12 +57,12 @@
CONTROLLER_GEN = $(tool_bin)/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
- $(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
+ $(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION))
KUSTOMIZE = $(tool_bin)/kustomize
.PHONY: kustomize
kustomize: ## Download kustomize locally if necessary.
- $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.4.1)
+ $(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION))
ENVTEST = $(tool_bin)/setup-envtest
.PHONY: envtest
@@ -74,7 +78,7 @@
GOLANGCILINT= $(tool_bin)/golangci-lint
.PHONY: golangci-lint
golangci-lint: ## Download golangci-lint locally if necessary.
- $(call go-install-tool,$(GOLANGCILINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2)
+ $(call go-install-tool,$(GOLANGCILINT),github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION))
.PHONY: dependency-check
diff --git a/hack/prepare-e2e.sh b/hack/prepare-e2e.sh
index 05fa0dc..e4d3480 100755
--- a/hack/prepare-e2e.sh
+++ b/hack/prepare-e2e.sh
@@ -21,12 +21,16 @@
INSTALL_DIR=/usr/local/bin
+KUBECTL_VERSION=v1.21.10
+SWCTL_VERSION=0.9.0
+YQ_VERSION=v4.11.1
+
prepare_ok=true
# install kubectl
function install_kubectl()
{
if ! command -v kubectl &> /dev/null; then
- curl -LO https://dl.k8s.io/release/v1.21.10/bin/${OS}/${ARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl ${INSTALL_DIR}
+ curl -LO https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl ${INSTALL_DIR}
if [ $? -ne 0 ]; then
echo "install kubectl error, please check"
prepare_ok=false
@@ -37,9 +41,9 @@
function install_swctl()
{
if ! command -v swctl &> /dev/null; then
- wget https://github.com/apache/skywalking-cli/archive/0.9.0.tar.gz -O - |\
- tar xz && cd skywalking-cli-0.9.0 && make ${OS} && mv bin/swctl-*-${OS}-amd64 ${INSTALL_DIR}/swctl \
- && cd .. && rm -r skywalking-cli-0.9.0
+ 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} \
+ && cd .. && rm -r skywalking-cli-${SWCTL_VERSION}
if [ $? -ne 0 ]; then
echo "install swctl error, please check"
prepare_ok=false
@@ -51,7 +55,7 @@
{
if ! command -v yq &> /dev/null; then
echo "install yq..."
- wget https://github.com/mikefarah/yq/releases/download/v4.11.1/yq_${OS}_${ARCH}.tar.gz -O - |\
+ wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_${OS}_${ARCH}.tar.gz -O - |\
tar xz && mv yq_${OS}_${ARCH} ${INSTALL_DIR}/yq
if [ $? -ne 0 ]; then
echo "install yq error, please check"
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 9fda838..65602f0 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
# Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
WORKDIR /workspace
# Copy the Go Modules manifests
diff --git a/operator/apis/operator/v1alpha1/groupversion_info.go b/operator/apis/operator/v1alpha1/groupversion_info.go
index f62d303..cba2eb5 100644
--- a/operator/apis/operator/v1alpha1/groupversion_info.go
+++ b/operator/apis/operator/v1alpha1/groupversion_info.go
@@ -16,8 +16,8 @@
// under the License.
// Package v1alpha1 contains API Schema definitions for the operator v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=operator.skywalking.apache.org
+// +kubebuilder:object:generate=true
+// +groupName=operator.skywalking.apache.org
package v1alpha1
import (
diff --git a/operator/apis/operator/v1alpha1/oapserverconfig_webhook.go b/operator/apis/operator/v1alpha1/oapserverconfig_webhook.go
index 9d77455..2c877cb 100644
--- a/operator/apis/operator/v1alpha1/oapserverconfig_webhook.go
+++ b/operator/apis/operator/v1alpha1/oapserverconfig_webhook.go
@@ -44,9 +44,9 @@
func (r *OAPServerConfig) Default() {
oapserverconfiglog.Info("default", "name", r.Name)
- // Default version is "9.1.0"
+ // Default version is "9.2.0"
if r.Spec.Version == "" {
- r.Spec.Version = "9.1.0"
+ r.Spec.Version = "9.2.0"
}
}
diff --git a/operator/apis/operator/v1alpha1/oapserverdynamicconfig_webhook.go b/operator/apis/operator/v1alpha1/oapserverdynamicconfig_webhook.go
index 9549590..b6e87f1 100644
--- a/operator/apis/operator/v1alpha1/oapserverdynamicconfig_webhook.go
+++ b/operator/apis/operator/v1alpha1/oapserverdynamicconfig_webhook.go
@@ -44,9 +44,9 @@
func (r *OAPServerDynamicConfig) Default() {
oapserverdynamicconfiglog.Info("default", "name", r.Name)
- // Default version is "9.1.0"
+ // Default version is "9.2.0"
if r.Spec.Version == "" {
- r.Spec.Version = "9.1.0"
+ r.Spec.Version = "9.2.0"
}
// Default labelselector is "app=collector,release=skywalking"
diff --git a/operator/apis/operator/v1alpha1/swagent_types.go b/operator/apis/operator/v1alpha1/swagent_types.go
index 1e29277..04de048 100644
--- a/operator/apis/operator/v1alpha1/swagent_types.go
+++ b/operator/apis/operator/v1alpha1/swagent_types.go
@@ -57,7 +57,7 @@
// Image is the image for initContainer, which commonly contains SkyWalking java agent SDK.
// +optional
- Image string `json:"image,omitempty" default:"apache/skywalking-java-agent:8.8.0-java8"`
+ Image string `json:"image,omitempty" default:"apache/skywalking-java-agent:8.13.0-java8"`
// Command is the command for initContainer.
// +optional
diff --git a/operator/apis/operator/v1alpha1/swagent_webhook.go b/operator/apis/operator/v1alpha1/swagent_webhook.go
index aedb4fc..f2af53d 100644
--- a/operator/apis/operator/v1alpha1/swagent_webhook.go
+++ b/operator/apis/operator/v1alpha1/swagent_webhook.go
@@ -92,7 +92,7 @@
r.Spec.JavaSidecar.Name = "inject-skywalking-agent"
}
if len(r.Spec.JavaSidecar.Image) == 0 {
- r.Spec.JavaSidecar.Image = "apache/skywalking-java-agent:8.8.0-java8"
+ r.Spec.JavaSidecar.Image = "apache/skywalking-java-agent:8.13.0-java8"
}
if len(r.Spec.JavaSidecar.Command) == 0 {
if r.Spec.JavaSidecar.Command == nil {
diff --git a/operator/config/samples/default.yaml b/operator/config/samples/default.yaml
index d32fb9f..99e7afe 100644
--- a/operator/config/samples/default.yaml
+++ b/operator/config/samples/default.yaml
@@ -20,9 +20,9 @@
metadata:
name: default
spec:
- version: 9.1.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.1.0
+ image: apache/skywalking-oap-server:9.2.0
service:
template:
type: ClusterIP
@@ -33,9 +33,9 @@
metadata:
name: default
spec:
- version: 9.1.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.1.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://default-oap.default:12800
service:
template:
diff --git a/operator/config/samples/fetcher.yaml b/operator/config/samples/fetcher.yaml
index b7a15e9..f0a2a2e 100644
--- a/operator/config/samples/fetcher.yaml
+++ b/operator/config/samples/fetcher.yaml
@@ -30,9 +30,9 @@
metadata:
name: default
spec:
- version: 9.1.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.1.0
+ image: apache/skywalking-oap-server:9.2.0
config:
- name: SW_OTEL_RECEIVER
value: default
@@ -46,9 +46,9 @@
metadata:
name: default
spec:
- version: 9.1.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.1.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: default-oap:12800
service:
template:
diff --git a/operator/config/samples/swagent.yaml b/operator/config/samples/swagent.yaml
index 70dc23d..54adac7 100644
--- a/operator/config/samples/swagent.yaml
+++ b/operator/config/samples/swagent.yaml
@@ -24,7 +24,7 @@
selector:
javaSidecar:
name: swagent-sample
- image: apache/skywalking-java-agent:8.8.0-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
diff --git a/operator/controllers/operator/oapserver_controller.go b/operator/controllers/operator/oapserver_controller.go
index 1315f24..097abc7 100644
--- a/operator/controllers/operator/oapserver_controller.go
+++ b/operator/controllers/operator/oapserver_controller.go
@@ -144,7 +144,7 @@
})
}
-//InjectStorage Inject Storage
+// InjectStorage Inject Storage
func (r *OAPServerReconciler) InjectStorage(ctx context.Context, log logr.Logger, oapServer *operatorv1alpha1.OAPServer) {
if oapServer.Spec.StorageConfig.Name == "" {
return
diff --git a/operator/dist/LICENSE b/operator/dist/LICENSE
index 71c016c..6c3ff52 100644
--- a/operator/dist/LICENSE
+++ b/operator/dist/LICENSE
@@ -179,112 +179,39 @@
========================================================================
cloud.google.com/go v0.81.0 Apache-2.0
- cloud.google.com/go/bigquery v1.8.0 Apache-2.0
- cloud.google.com/go/datastore v1.1.0 Apache-2.0
- cloud.google.com/go/firestore v1.1.0 Apache-2.0
- cloud.google.com/go/pubsub v1.3.1 Apache-2.0
- cloud.google.com/go/storage v1.10.0 Apache-2.0
github.com/Azure/go-autorest v14.2.0+incompatible Apache-2.0
github.com/Azure/go-autorest/autorest v0.11.18 Apache-2.0
github.com/Azure/go-autorest/autorest/adal v0.9.13 Apache-2.0
github.com/Azure/go-autorest/autorest/date v0.3.0 Apache-2.0
- github.com/Azure/go-autorest/autorest/mocks v0.4.1 Apache-2.0
github.com/Azure/go-autorest/logger v0.2.1 Apache-2.0
github.com/Azure/go-autorest/tracing v0.6.0 Apache-2.0
github.com/Masterminds/goutils v1.1.0 Apache-2.0
- github.com/NYTimes/gziphandler v1.1.1 Apache-2.0
- github.com/OneOfOne/xxhash v1.2.2 Apache-2.0
- github.com/census-instrumentation/opencensus-proto v0.2.1 Apache-2.0
- github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 Apache-2.0
- github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed Apache-2.0
- github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 Apache-2.0
- github.com/cockroachdb/errors v1.2.4 Apache-2.0
- github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f Apache-2.0
- github.com/coreos/etcd v3.3.13+incompatible Apache-2.0
- github.com/coreos/go-oidc v2.1.0+incompatible Apache-2.0
- github.com/coreos/go-semver v0.3.0 Apache-2.0
- github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e Apache-2.0
- github.com/coreos/go-systemd/v22 v22.3.2 Apache-2.0
- github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f Apache-2.0
- github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0 Apache-2.0
- github.com/envoyproxy/protoc-gen-validate v0.1.0 Apache-2.0
github.com/go-logr/logr v1.2.0 Apache-2.0
github.com/go-logr/zapr v1.2.0 Apache-2.0
github.com/go-openapi/jsonpointer v0.19.5 Apache-2.0
github.com/go-openapi/jsonreference v0.19.5 Apache-2.0
github.com/go-openapi/swag v0.19.14 Apache-2.0
- github.com/golang/glog v1.0.0 Apache-2.0
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da Apache-2.0
- github.com/golang/mock v1.5.0 Apache-2.0
- github.com/google/btree v1.0.1 Apache-2.0
- github.com/google/cel-spec v0.6.0 Apache-2.0
github.com/google/gnostic v0.5.7-v3refs Apache-2.0
github.com/google/gofuzz v1.1.0 Apache-2.0
- github.com/google/martian v2.1.0+incompatible Apache-2.0
- github.com/google/martian/v3 v3.1.0 Apache-2.0
- github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5 Apache-2.0
- github.com/google/renameio v0.1.0 Apache-2.0
- github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 Apache-2.0
- github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 Apache-2.0
- github.com/inconshreveable/mousetrap v1.0.0 Apache-2.0
- github.com/jonboulle/clockwork v0.2.2 Apache-2.0
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 Apache-2.0
- github.com/moby/spdystream v0.2.0 Apache-2.0
- github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 Apache-2.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd Apache-2.0
github.com/modern-go/reflect2 v1.0.2 Apache-2.0
- github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f Apache-2.0
- github.com/oklog/ulid v1.3.1 Apache-2.0
- github.com/opentracing/opentracing-go v1.1.0 Apache-2.0
- github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 Apache-2.0
github.com/prometheus/client_golang v1.12.1 Apache-2.0
github.com/prometheus/client_model v0.2.0 Apache-2.0
github.com/prometheus/common v0.32.1 Apache-2.0
github.com/prometheus/procfs v0.7.3 Apache-2.0
- github.com/prometheus/tsdb v0.7.1 Apache-2.0
- github.com/soheilhy/cmux v0.1.5 Apache-2.0
- github.com/spf13/afero v1.6.0 Apache-2.0
- github.com/spf13/cobra v1.4.0 Apache-2.0
- go.etcd.io/etcd/api/v3 v3.5.1 Apache-2.0
- go.etcd.io/etcd/client/pkg/v3 v3.5.1 Apache-2.0
- go.etcd.io/etcd/client/v2 v2.305.0 Apache-2.0
- go.etcd.io/etcd/client/v3 v3.5.1 Apache-2.0
- go.etcd.io/etcd/pkg/v3 v3.5.0 Apache-2.0
- go.etcd.io/etcd/raft/v3 v3.5.0 Apache-2.0
- go.etcd.io/etcd/server/v3 v3.5.0 Apache-2.0
- go.opencensus.io v0.23.0 Apache-2.0
- go.opentelemetry.io/contrib v0.20.0 Apache-2.0
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 Apache-2.0
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 Apache-2.0
- go.opentelemetry.io/otel v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/exporters/otlp v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/metric v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/oteltest v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/sdk v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/sdk/export/metric v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/sdk/metric v0.20.0 Apache-2.0
- go.opentelemetry.io/otel/trace v0.20.0 Apache-2.0
- go.opentelemetry.io/proto/otlp v0.7.0 Apache-2.0
gomodules.xyz/jsonpatch/v2 v2.2.0 Apache-2.0
google.golang.org/appengine v1.6.7 Apache-2.0
- google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 Apache-2.0
- google.golang.org/grpc v1.40.0 Apache-2.0
- gopkg.in/ini.v1 v1.51.0 Apache-2.0
- gopkg.in/square/go-jose.v2 v2.2.2 Apache-2.0
gopkg.in/yaml.v2 v2.4.0 Apache-2.0
- gotest.tools/v3 v3.0.3 Apache-2.0
k8s.io/api v0.24.2 Apache-2.0
k8s.io/apiextensions-apiserver v0.24.2 Apache-2.0
k8s.io/apimachinery v0.24.2 Apache-2.0
- k8s.io/apiserver v0.24.2 Apache-2.0
k8s.io/client-go v0.24.2 Apache-2.0
- k8s.io/code-generator v0.24.2 Apache-2.0
k8s.io/component-base v0.24.2 Apache-2.0
- k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 Apache-2.0
k8s.io/klog/v2 v2.60.1 Apache-2.0
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 Apache-2.0
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 Apache-2.0
- sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 Apache-2.0
sigs.k8s.io/controller-runtime v0.12.3 Apache-2.0
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 Apache-2.0
@@ -292,98 +219,41 @@
Apache-2.0 and BSD-3-Clause licenses
========================================================================
- github.com/google/cel-go v0.10.1 Apache-2.0 and BSD-3-Clause
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 Apache-2.0 and BSD-3-Clause
========================================================================
BSD-2-Clause licenses
========================================================================
- github.com/godbus/dbus/v5 v5.0.4 BSD-2-Clause
- github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 BSD-2-Clause
- github.com/gorilla/websocket v1.4.2 BSD-2-Clause
- github.com/magiconair/properties v1.8.1 BSD-2-Clause
github.com/pkg/errors v0.9.1 BSD-2-Clause
- github.com/pkg/sftp v1.10.1 BSD-2-Clause
- github.com/russross/blackfriday/v2 v2.1.0 BSD-2-Clause
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f BSD-2-Clause
========================================================================
BSD-3-Clause licenses
========================================================================
- dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 BSD-3-Clause
github.com/PuerkitoBio/purell v1.1.1 BSD-3-Clause
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 BSD-3-Clause
- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 BSD-3-Clause
- github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e BSD-3-Clause
- github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 BSD-3-Clause
github.com/evanphx/json-patch v5.6.0+incompatible BSD-3-Clause
github.com/fsnotify/fsnotify v1.5.1 BSD-3-Clause
- github.com/getsentry/raven-go v0.2.0 BSD-3-Clause
- github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 BSD-3-Clause
- github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 BSD-3-Clause
github.com/gogo/protobuf v1.3.2 BSD-3-Clause
github.com/golang/protobuf v1.5.2 BSD-3-Clause
github.com/google/go-cmp v0.5.5 BSD-3-Clause
github.com/google/uuid v1.1.2 BSD-3-Clause
- github.com/googleapis/gax-go/v2 v2.0.5 BSD-3-Clause
- github.com/gorilla/mux v1.8.0 BSD-3-Clause
- github.com/grpc-ecosystem/grpc-gateway v1.16.0 BSD-3-Clause
- github.com/hashicorp/go-msgpack v0.5.3 BSD-3-Clause
- github.com/hashicorp/go.net v0.0.1 BSD-3-Clause
- github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 BSD-3-Clause
github.com/imdario/mergo v0.3.12 BSD-3-Clause
- github.com/jessevdk/go-flags v1.4.0 BSD-3-Clause
- github.com/julienschmidt/httprouter v1.3.0 BSD-3-Clause
- github.com/kr/fs v0.1.0 BSD-3-Clause
- github.com/miekg/dns v1.0.14 BSD-3-Clause
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 BSD-3-Clause
- github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f BSD-3-Clause
- github.com/pmezard/go-difflib v1.0.0 BSD-3-Clause
- github.com/rogpeppe/fastuuid v1.2.0 BSD-3-Clause
- github.com/rogpeppe/go-internal v1.3.0 BSD-3-Clause
- github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 BSD-3-Clause
github.com/spf13/pflag v1.0.5 BSD-3-Clause
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 BSD-3-Clause
- golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 BSD-3-Clause
- golang.org/x/image v0.0.0-20190802002840-cff245a6509b BSD-3-Clause
- golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 BSD-3-Clause
- golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 BSD-3-Clause
- golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 BSD-3-Clause
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd BSD-3-Clause
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 BSD-3-Clause
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c BSD-3-Clause
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 BSD-3-Clause
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 BSD-3-Clause
golang.org/x/text v0.3.7 BSD-3-Clause
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 BSD-3-Clause
- golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 BSD-3-Clause
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 BSD-3-Clause
- google.golang.org/api v0.43.0 BSD-3-Clause
google.golang.org/protobuf v1.27.1 BSD-3-Clause
- gopkg.in/errgo.v2 v2.1.0 BSD-3-Clause
- gopkg.in/fsnotify.v1 v1.4.7 BSD-3-Clause
gopkg.in/inf.v0 v0.9.1 BSD-3-Clause
- gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 BSD-3-Clause
- rsc.io/binaryregexp v0.2.0 BSD-3-Clause
- rsc.io/quote/v3 v3.1.0 BSD-3-Clause
- rsc.io/sampler v1.3.0 BSD-3-Clause
software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 BSD-3-Clause
========================================================================
-BSD-3-Clause and GooglePatentClause licenses
-========================================================================
-
- github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 BSD-3-Clause and GooglePatentClause
-
-========================================================================
-CC0-1.0 licenses
-========================================================================
-
- github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c CC0-1.0
-
-========================================================================
ISC licenses
========================================================================
@@ -393,101 +263,23 @@
MIT licenses
========================================================================
- github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 MIT
- github.com/BurntSushi/toml v0.3.1 MIT
github.com/Masterminds/semver/v3 v3.1.0 MIT
github.com/Masterminds/sprig/v3 v3.1.0 MIT
- github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d MIT
- github.com/antihax/optional v1.0.0 MIT
- github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e MIT
- github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da MIT
- github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 MIT
- github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 MIT
- github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a MIT
- github.com/benbjohnson/clock v1.1.0 MIT
github.com/beorn7/perks v1.0.1 MIT
- github.com/bgentry/speakeasy v0.1.0 MIT
- github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c MIT
- github.com/blang/semver/v4 v4.0.0 MIT
- github.com/cespare/xxhash v1.1.0 MIT
github.com/cespare/xxhash/v2 v2.1.2 MIT
- github.com/chzyer/logex v1.1.10 MIT
- github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e MIT
- github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 MIT
- github.com/client9/misspell v0.3.4 MIT
- github.com/coreos/bbolt v1.3.2 MIT
- github.com/cpuguy83/go-md2man/v2 v2.0.1 MIT
- github.com/creack/pty v1.1.11 MIT
- github.com/dgrijalva/jwt-go v3.2.0+incompatible MIT
- github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 MIT
- github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 MIT
- github.com/dustin/go-humanize v1.0.0 MIT
github.com/emicklei/go-restful v2.9.5+incompatible MIT
- github.com/fatih/color v1.7.0 MIT
- github.com/felixge/httpsnoop v1.0.1 MIT
github.com/form3tech-oss/jwt-go v3.2.3+incompatible MIT
- github.com/getkin/kin-openapi v0.76.0 MIT
- github.com/go-kit/kit v0.9.0 MIT
- github.com/go-kit/log v0.1.0 MIT
- github.com/go-logfmt/logfmt v0.5.0 MIT
- github.com/go-stack/stack v1.8.0 MIT
- github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 MIT
- github.com/hashicorp/go-syslog v1.0.0 MIT
- github.com/hashicorp/mdns v1.0.0 MIT
- github.com/hpcloud/tail v1.0.0 MIT
github.com/huandu/xstrings v1.3.1 MIT
github.com/josharian/intern v1.0.0 MIT
- github.com/jpillora/backoff v1.0.0 MIT
github.com/json-iterator/go v1.1.12 MIT
- github.com/jstemmer/go-junit-report v0.9.1 MIT
- github.com/jtolds/gls v4.20.0+incompatible MIT
- github.com/kisielk/errcheck v1.5.0 MIT
- github.com/kisielk/gotool v1.0.0 MIT
- github.com/konsorten/go-windows-terminal-sequences v1.0.3 MIT
- github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 MIT
- github.com/kr/pretty v0.2.0 MIT
- github.com/kr/pty v1.1.1 MIT
- github.com/kr/text v0.2.0 MIT
github.com/mailru/easyjson v0.7.6 MIT
- github.com/mattn/go-colorable v0.0.9 MIT
- github.com/mattn/go-isatty v0.0.3 MIT
github.com/mitchellh/copystructure v1.0.0 MIT
- github.com/mitchellh/go-homedir v1.1.0 MIT
- github.com/mitchellh/go-testing-interface v1.0.0 MIT
- github.com/mitchellh/iochan v1.0.0 MIT
- github.com/mitchellh/mapstructure v1.4.1 MIT
github.com/mitchellh/reflectwalk v1.0.0 MIT
- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e MIT
- github.com/nxadm/tail v1.4.8 MIT
- github.com/onsi/ginkgo v1.16.5 MIT
- github.com/onsi/gomega v1.18.1 MIT
- github.com/pelletier/go-toml v1.2.0 MIT
- github.com/peterbourgon/diskv v2.0.1+incompatible MIT
- github.com/posener/complete v1.1.1 MIT
- github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f MIT
- github.com/shurcooL/sanitized_anchor_name v1.0.0 MIT
github.com/sirupsen/logrus v1.8.1 MIT
- github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d MIT
- github.com/smartystreets/goconvey v1.6.4 MIT
github.com/spf13/cast v1.3.1 MIT
- github.com/spf13/jwalterweatherman v1.0.0 MIT
- github.com/spf13/viper v1.7.0 MIT
- github.com/stoewer/go-strcase v1.2.0 MIT
- github.com/stretchr/objx v0.1.1 MIT
- github.com/stretchr/testify v1.7.0 MIT
- github.com/subosito/gotenv v1.2.0 MIT
- github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 MIT
- github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 MIT
- github.com/yuin/goldmark v1.4.1 MIT
- go.etcd.io/bbolt v1.3.6 MIT
go.uber.org/atomic v1.7.0 MIT
- go.uber.org/goleak v1.1.12 MIT
go.uber.org/multierr v1.6.0 MIT
go.uber.org/zap v1.19.1 MIT
- gopkg.in/alecthomas/kingpin.v2 v2.2.6 MIT
- gopkg.in/natefinch/lumberjack.v2 v2.0.0 MIT
- gopkg.in/resty.v1 v1.12.0 MIT
- honnef.co/go/tools v0.0.1-2020.1.4 MIT
========================================================================
MIT and Apache-2.0 licenses
@@ -500,28 +292,5 @@
========================================================================
github.com/ghodss/yaml v1.0.0 MIT and BSD-3-Clause
- github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 MIT and BSD-3-Clause
sigs.k8s.io/yaml v1.3.0 MIT and BSD-3-Clause
-========================================================================
-MPL-2.0 licenses
-========================================================================
-
- github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 MPL-2.0
- github.com/hashicorp/consul/api v1.1.0 MPL-2.0
- github.com/hashicorp/consul/sdk v0.1.1 MPL-2.0
- github.com/hashicorp/errwrap v1.0.0 MPL-2.0
- github.com/hashicorp/go-cleanhttp v0.5.1 MPL-2.0
- github.com/hashicorp/go-immutable-radix v1.0.0 MPL-2.0
- github.com/hashicorp/go-multierror v1.0.0 MPL-2.0
- github.com/hashicorp/go-rootcerts v1.0.0 MPL-2.0
- github.com/hashicorp/go-sockaddr v1.0.0 MPL-2.0
- github.com/hashicorp/go-uuid v1.0.1 MPL-2.0
- github.com/hashicorp/golang-lru v0.5.1 MPL-2.0
- github.com/hashicorp/hcl v1.0.0 MPL-2.0
- github.com/hashicorp/logutils v1.0.0 MPL-2.0
- github.com/hashicorp/memberlist v0.1.3 MPL-2.0
- github.com/hashicorp/serf v0.8.2 MPL-2.0
- github.com/mitchellh/cli v1.0.0 MPL-2.0
- github.com/mitchellh/gox v0.4.0 MPL-2.0
-
diff --git a/operator/go.mod b/operator/go.mod
index 8486181..672d8f4 100644
--- a/operator/go.mod
+++ b/operator/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-swck/operator
-go 1.17
+go 1.19
require (
github.com/Masterminds/sprig/v3 v3.1.0
diff --git a/operator/go.sum b/operator/go.sum
index 4e6b2ee..651c373 100644
--- a/operator/go.sum
+++ b/operator/go.sum
@@ -93,7 +93,6 @@
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -181,7 +180,6 @@
github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -258,7 +256,6 @@
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
@@ -377,22 +374,16 @@
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -522,7 +513,6 @@
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
-go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -624,7 +614,6 @@
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -702,7 +691,6 @@
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -795,7 +783,6 @@
golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
diff --git a/operator/pkg/operator/injector/configmap.go b/operator/pkg/operator/injector/configmap.go
index d4f440c..f1308d7 100644
--- a/operator/pkg/operator/injector/configmap.go
+++ b/operator/pkg/operator/injector/configmap.go
@@ -14,6 +14,8 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
+
+// Package injector provides the logic to inject the agent into the pod
package injector
import (
diff --git a/operator/pkg/operator/injector/validate.go b/operator/pkg/operator/injector/validate.go
index f8e302d..11a1ec7 100644
--- a/operator/pkg/operator/injector/validate.go
+++ b/operator/pkg/operator/injector/validate.go
@@ -77,7 +77,7 @@
return nil
}
-//ValidateServiceName validates the ServiceName is nil or not
+// ValidateServiceName validates the ServiceName is nil or not
func ValidateServiceName(annotation, value string) error {
if value == "" {
return fmt.Errorf("%s error:the service name is nil", annotation)
@@ -85,7 +85,7 @@
return nil
}
-//ValidateBackendServices validates an annotation's value is valid backend services
+// ValidateBackendServices validates an annotation's value is valid backend services
func ValidateBackendServices(annotation, value string) error {
services := []string{value}
if strings.Contains(value, ",") {
@@ -109,7 +109,7 @@
return nil
}
-//ValidateIPv4OrHostname validates an annotation's value is valid ipv4 or hostname
+// ValidateIPv4OrHostname validates an annotation's value is valid ipv4 or hostname
func ValidateIPv4OrHostname(annotation, service string) error {
service = strings.TrimSpace(service)
colonIndex := strings.LastIndex(service, ":")
@@ -137,7 +137,7 @@
return nil
}
-//ValidateResourceRequirements validates the resource requirement
+// ValidateResourceRequirements validates the resource requirement
func ValidateResourceRequirements(annotation, value string) error {
if value == "nil" {
return nil
diff --git a/operator/pkg/operator/manifests/injector/templates/annotations.yaml b/operator/pkg/operator/manifests/injector/templates/annotations.yaml
index d703bb2..11ec641 100644
--- a/operator/pkg/operator/manifests/injector/templates/annotations.yaml
+++ b/operator/pkg/operator/manifests/injector/templates/annotations.yaml
@@ -30,7 +30,7 @@
envName: nil
- name: sidecar.skywalking.apache.org/initcontainer.Image
- defaultValue: apache/skywalking-java-agent:8.10.0-java8
+ defaultValue: apache/skywalking-java-agent:8.13.0-java8
validateFunc: nil
envName: nil
diff --git a/test/e2e/deploy-banyandb.yaml b/test/e2e/deploy-banyandb.yaml
index 81252a5..48ca3bf 100644
--- a/test/e2e/deploy-banyandb.yaml
+++ b/test/e2e/deploy-banyandb.yaml
@@ -46,8 +46,6 @@
operator: In
values:
- banyandb
-
-
---
apiVersion: v1
kind: PersistentVolume
diff --git a/test/e2e/oap-ui-agent-oapserverconfig-oapserverdynamicconfig/e2e.yaml b/test/e2e/oap-ui-agent-oapserverconfig-oapserverdynamicconfig/e2e.yaml
index 830ceaa..7385888 100644
--- a/test/e2e/oap-ui-agent-oapserverconfig-oapserverdynamicconfig/e2e.yaml
+++ b/test/e2e/oap-ui-agent-oapserverconfig-oapserverdynamicconfig/e2e.yaml
@@ -112,7 +112,7 @@
# max retry count
count: 20
# the interval between two attempts, e.g. 10s, 1m.
- interval: 10s
+ interval: 15s
cases:
# test oapserver
- query: swctl --display yaml --base-url=http://${service_skywalking_system_oap_host}:${service_skywalking_system_oap_12800}/graphql service ls
@@ -126,12 +126,6 @@
- includes:
- ../ui-cases.yaml
# test oapsever's static configuration
- - query: |
- swctl --display yaml --base-url=http://${service_skywalking_system_oap_host}:${service_skywalking_system_oap_12800}/graphql logs list --service-name=agent::songs --tags level=INFO --trace-id=$( \
- swctl --display yaml --base-url=http://${service_skywalking_system_oap_host}:${service_skywalking_system_oap_12800}/graphql trace ls \
- | yq e '.traces | select(.[].endpointnames[0]=="HikariCP/Connection/getConnection") | .[0].traceids[0]' -
- ) | yq e '.logs' -
- expected: ../verify/logs.yaml
- query: swctl --display yaml --base-url=http://${service_skywalking_system_oap_host}:${service_skywalking_system_oap_12800}/graphql metrics linear --name=log_count_info --instance-name=songs --service-name=agent::songs | yq e 'to_entries' -
expected: ../verify/metrics.yaml
# test oapsever's dynamic configuration
diff --git a/test/e2e/oapserverconfig-demo.yaml b/test/e2e/oapserverconfig-demo.yaml
index cdf982a..a39c2e0 100644
--- a/test/e2e/oapserverconfig-demo.yaml
+++ b/test/e2e/oapserverconfig-demo.yaml
@@ -23,7 +23,7 @@
namespace: skywalking-system
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The env configuration of OAPServer
env:
- name: ONLY_TEST
diff --git a/test/e2e/oapserverdynamicconfig-demo.yaml b/test/e2e/oapserverdynamicconfig-demo.yaml
index c25efc5..3c70414 100644
--- a/test/e2e/oapserverdynamicconfig-demo.yaml
+++ b/test/e2e/oapserverdynamicconfig-demo.yaml
@@ -23,7 +23,7 @@
namespace: skywalking-system
spec:
# The version of OAPServer
- version: 9.0.0
+ version: 9.2.0
# The labelselector of OAPServer's dynamic configuration, it should be the same as labelSelector of OAPServerConfig
labelSelector: app=collector,release=skywalking
data:
diff --git a/test/e2e/skywalking-components-with-banyandb.yaml b/test/e2e/skywalking-components-with-banyandb.yaml
index 1d8ba20..64a6061 100644
--- a/test/e2e/skywalking-components-with-banyandb.yaml
+++ b/test/e2e/skywalking-components-with-banyandb.yaml
@@ -28,9 +28,7 @@
type: ClusterIP
config:
- name: SW_STORAGE_BANYANDB_HOST
- value: banyandb-test-banyandb-grpc.default.svc.cluster.local
- - name: SW_STORAGE
- value: banyandb
+ value: banyandb-test-banyandb-grpc.default
---
apiVersion: operator.skywalking.apache.org/v1alpha1
kind: UI
@@ -38,9 +36,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.0.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://default-oap.default:12800
service:
template:
diff --git a/test/e2e/skywalking-components-with-satellite.yaml b/test/e2e/skywalking-components-with-satellite.yaml
index 71d2611..cb748f1 100644
--- a/test/e2e/skywalking-components-with-satellite.yaml
+++ b/test/e2e/skywalking-components-with-satellite.yaml
@@ -21,9 +21,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.0.0
+ image: apache/skywalking-oap-server:9.2.0
config:
- name: SW_METER_ANALYZER_ACTIVE_FILES
value: satellite
@@ -55,9 +55,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.0.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://skywalking-system-oap.skywalking-system:12800
service:
template:
diff --git a/test/e2e/skywalking-components-with-storage.yaml b/test/e2e/skywalking-components-with-storage.yaml
index 1dd0777..84e666d 100644
--- a/test/e2e/skywalking-components-with-storage.yaml
+++ b/test/e2e/skywalking-components-with-storage.yaml
@@ -20,9 +20,9 @@
metadata:
name: default
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.0.0
+ image: apache/skywalking-oap-server:9.2.0
service:
template:
type: ClusterIP
@@ -35,9 +35,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.0.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://default-oap.default:12800
service:
template:
diff --git a/test/e2e/skywalking-components-with-swagent-configmap.yaml b/test/e2e/skywalking-components-with-swagent-configmap.yaml
index 8d43ede..db59877 100644
--- a/test/e2e/skywalking-components-with-swagent-configmap.yaml
+++ b/test/e2e/skywalking-components-with-swagent-configmap.yaml
@@ -21,7 +21,7 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 8.8.1
+ version: 9.2.0
instances: 1
image: ghcr.io/apache/skywalking/oap:46ae1cfe1ea137577a6d191f4bda39ea82feb2ac
service:
@@ -35,9 +35,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 8.8.1
+ version: 9.2.0
instances: 1
- image: ghcr.io/apache/skywalking/ui:46ae1cfe1ea137577a6d191f4bda39ea82feb2ac
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://skywalking-system-oap.skywalking-system:12800
service:
template:
@@ -77,7 +77,7 @@
selector:
javaSidecar:
name: swagent-001
- image: ghcr.io/apache/skywalking-java/skywalking-java:438d2954232ee7b996ca0a7d961eddcd2da0c5e6-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
diff --git a/test/e2e/skywalking-components-with-swagent.yaml b/test/e2e/skywalking-components-with-swagent.yaml
index f0840ee..8a5e4ee 100644
--- a/test/e2e/skywalking-components-with-swagent.yaml
+++ b/test/e2e/skywalking-components-with-swagent.yaml
@@ -21,9 +21,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 8.8.1
+ version: 9.2.0
instances: 1
- image: ghcr.io/apache/skywalking/oap:46ae1cfe1ea137577a6d191f4bda39ea82feb2ac
+ image: apache/skywalking-oap-server:9.2.0
service:
template:
type: ClusterIP
@@ -35,9 +35,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 8.8.1
+ version: 9.2.0
instances: 1
- image: ghcr.io/apache/skywalking/ui:46ae1cfe1ea137577a6d191f4bda39ea82feb2ac
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://skywalking-system-oap.skywalking-system:12800
service:
template:
@@ -56,7 +56,7 @@
selector:
javaSidecar:
name: swagent-001
- image: ghcr.io/apache/skywalking-java/skywalking-java:f8deb7c30b931aae83ac1f438ce72b3f74414ae5-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
@@ -78,7 +78,7 @@
selector:
javaSidecar:
name: swagent-002
- image: ghcr.io/apache/skywalking-java/skywalking-java:438d2954232ee7b996ca0a7d961eddcd2da0c5e6-java8
+ image: apache/skywalking-java-agent:8.13.0-java8
env:
- name: "SW_LOGGING_LEVEL"
value: "DEBUG"
diff --git a/test/e2e/skywalking-components.yaml b/test/e2e/skywalking-components.yaml
index dbb51b9..23c58f9 100644
--- a/test/e2e/skywalking-components.yaml
+++ b/test/e2e/skywalking-components.yaml
@@ -21,9 +21,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-oap-server:9.0.0
+ image: apache/skywalking-oap-server:9.2.0
service:
template:
type: ClusterIP
@@ -35,9 +35,9 @@
name: skywalking-system
namespace: skywalking-system
spec:
- version: 9.0.0
+ version: 9.2.0
instances: 1
- image: apache/skywalking-ui:9.0.0
+ image: apache/skywalking-ui:9.2.0
OAPServerAddress: http://skywalking-system-oap.skywalking-system:12800
service:
template:
diff --git a/test/e2e/verify/logs.yaml b/test/e2e/verify/logs.yaml
deleted file mode 100644
index e98afc2..0000000
--- a/test/e2e/verify/logs.yaml
+++ /dev/null
@@ -1,37 +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.
-
-{{- contains . }}
-- servicename: agent::songs
- serviceid: {{ b64enc "agent::songs" }}.1
- serviceinstancename: songs
- serviceinstanceid: {{ b64enc "agent::songs" }}.1_{{ b64enc "songs" }}
- endpointname: null
- endpointid: null
- traceid: {{ .traceid }}
- timestamp: {{ gt .timestamp 0 }}
- contenttype: TEXT
- content: |
- {{ notEmpty .content }}
- tags:
- {{- contains .tags }}
- - key: level
- value: INFO
- - key: logger
- value: {{ notEmpty .value }}
- - key: thread
- value: {{ notEmpty .value }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/test/e2e/verify/swagent-configmap-initcontainer.yaml b/test/e2e/verify/swagent-configmap-initcontainer.yaml
index 72351bc..6fc5d1a 100644
--- a/test/e2e/verify/swagent-configmap-initcontainer.yaml
+++ b/test/e2e/verify/swagent-configmap-initcontainer.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
{{- contains .}}
-- image: apache/skywalking-java-agent:8.9.0-java8
+- image: apache/skywalking-java-agent:8.13.0-java8
name: swagent-001
volumeMounts:
- montPath: /sky/agent
diff --git a/test/e2e/verify/swagent-initcontainer.yaml b/test/e2e/verify/swagent-initcontainer.yaml
index e320393..dbc69a1 100644
--- a/test/e2e/verify/swagent-initcontainer.yaml
+++ b/test/e2e/verify/swagent-initcontainer.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
{{- contains .}}
-- image: apache/skywalking-java-agent:8.9.0-java8
+- image: apache/skywalking-java-agent:8.13.0-java8
name: swagent-002
volumeMounts:
- montPath: /sky/agent
