This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git
The following commit(s) were added to refs/heads/master by this push:
new a6b0c06 chore(deps): bump up go version (#166)
a6b0c06 is described below
commit a6b0c06670b2f7fd2360dd9b5f6d4e6112aae2cd
Author: kezhenxu94 <[email protected]>
AuthorDate: Thu Nov 6 15:03:22 2025 +0800
chore(deps): bump up go version (#166)
---
.github/workflows/go.yml | 60 ++++++++-------
adapter/Dockerfile | 2 +-
adapter/go.mod | 18 ++---
adapter/go.sum | 32 ++++----
hack/build/base.mk | 2 +-
hack/build/module.mk | 2 +-
operator/Dockerfile | 2 +-
.../operator.skywalking.apache.org_banyandbs.yaml | 22 ++----
...rator.skywalking.apache.org_eventexporters.yaml | 2 +-
.../operator.skywalking.apache.org_fetchers.yaml | 2 +-
.../operator.skywalking.apache.org_javaagents.yaml | 2 +-
...tor.skywalking.apache.org_oapserverconfigs.yaml | 43 ++++++++++-
...walking.apache.org_oapserverdynamicconfigs.yaml | 2 +-
.../operator.skywalking.apache.org_oapservers.yaml | 85 +++++++++++++++++++++-
.../operator.skywalking.apache.org_satellites.yaml | 43 ++++++++++-
.../operator.skywalking.apache.org_storages.yaml | 43 ++++++++++-
.../operator.skywalking.apache.org_swagents.yaml | 46 +++++++++++-
.../bases/operator.skywalking.apache.org_uis.yaml | 2 +-
operator/go.mod | 15 ++--
operator/go.sum | 28 +++----
20 files changed, 343 insertions(+), 110 deletions(-)
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index e5ab61c..e80cfc8 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -15,17 +15,14 @@
# limitations under the License.
name: Continuous Integration
-
on:
pull_request:
push:
branches:
- master
-
concurrency:
group: swck-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
-
jobs:
check:
name: Check
@@ -34,7 +31,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: "1.25"
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- name: Check License
@@ -48,7 +45,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: "1.25"
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- name: Build
@@ -62,11 +59,11 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: "1.25"
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- - name: "install kubebuilder"
+ - name: install kubebuilder
run: ./hack/install-kubebuilder.sh
- name: tests
run: make test
@@ -77,14 +74,14 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: "1.25"
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- name: Run E2E Test(oap+ui+agent)
- uses:
apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205 #
always prefer to use a revision instead of `main`.
+ 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
+ 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
@@ -92,7 +89,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -107,7 +104,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -122,12 +119,12 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
- name: Run E2E Test
- uses:
apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
+ uses:
apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
e2e-file: test/e2e/oap-ui-agent-internal-storage/e2e.yaml
- uses: actions/upload-artifact@v4
@@ -135,15 +132,15 @@ jobs:
name: Upload internal Logs
with:
name: internal-storage-logs
- path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
- external-storage-e2e-tests:
+ path: ${{ env.SW_INFRA_E2E_LOG_DIR }}
+ external-storage-e2e-tests:
name: e2e tests(oap+ui+agent+external-storage)
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -158,7 +155,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -166,14 +163,14 @@ jobs:
uses:
apache/skywalking-infra-e2e@996ed8902e941e2883fcf0ac5b3090364942d205
with:
e2e-file: test/e2e/banyandb/e2e.yaml
- adapter-hpa-e2e-tests:
+ adapter-hpa-e2e-tests:
name: e2e tests(oap+agent+adapter+hpa)
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -188,7 +185,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -203,7 +200,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -218,7 +215,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -233,7 +230,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.24'
+ go-version: 1.25
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
@@ -244,6 +241,19 @@ jobs:
checks:
name: build
runs-on: ubuntu-latest
- 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,
oapserver-eventexporter-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
+ - oapserver-eventexporter-e2e-tests
steps:
- run: echo 'success'
diff --git a/adapter/Dockerfile b/adapter/Dockerfile
index 46eb73f..b38d83d 100644
--- a/adapter/Dockerfile
+++ b/adapter/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
# Build the manager binary
-FROM golang:1.24 as builder
+FROM golang:1.25 As builder
WORKDIR /workspace
# Copy the Go Modules manifests
diff --git a/adapter/go.mod b/adapter/go.mod
index 80f4eeb..e9c73b0 100644
--- a/adapter/go.mod
+++ b/adapter/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-swck/adapter
-go 1.24.6
+go 1.25.3
require (
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f
@@ -80,17 +80,17 @@ require (
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
- golang.org/x/crypto v0.36.0 // indirect
+ golang.org/x/crypto v0.43.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
- golang.org/x/mod v0.17.0 // indirect
- golang.org/x/net v0.38.0 // indirect
+ golang.org/x/mod v0.29.0 // indirect
+ golang.org/x/net v0.46.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
- golang.org/x/sync v0.12.0 // indirect
- golang.org/x/sys v0.31.0 // indirect
- golang.org/x/term v0.30.0 // indirect
- golang.org/x/text v0.23.0 // indirect
+ golang.org/x/sync v0.17.0 // indirect
+ golang.org/x/sys v0.37.0 // indirect
+ golang.org/x/term v0.36.0 // indirect
+ golang.org/x/text v0.30.0 // indirect
golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+ golang.org/x/tools v0.38.0 // indirect
google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe //
indirect
google.golang.org/genproto/googleapis/api
v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto/googleapis/rpc
v0.0.0-20240125205218-1f4bbc51befe // indirect
diff --git a/adapter/go.sum b/adapter/go.sum
index 180bb9b..8536b42 100644
--- a/adapter/go.sum
+++ b/adapter/go.sum
@@ -684,8 +684,8 @@ golang.org/x/crypto
v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod
h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod
h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod
h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -718,8 +718,8 @@ golang.org/x/mod
v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod
h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
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=
@@ -756,8 +756,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod
h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod
h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod
h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod
h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -772,8 +772,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod
h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod
h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod
h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -819,11 +819,11 @@ golang.org/x/sys
v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod
h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod
h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -832,8 +832,8 @@ golang.org/x/text v0.3.3/go.mod
h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod
h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod
h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -887,8 +887,8 @@ golang.org/x/tools
v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod
h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod
h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
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/hack/build/base.mk b/hack/build/base.mk
index ac1dfce..7c40cdf 100644
--- a/hack/build/base.mk
+++ b/hack/build/base.mk
@@ -39,7 +39,7 @@ help: ## Display this help.
LICENSEEYE = $(tool_bin)/license-eye
.PHONY: licenseeye
licenseeye: ## Download skywalking-eye locally if necessary.
- $(call
go-install-tool,$(LICENSEEYE),github.com/apache/skywalking-eyes/cmd/license-eye@477772b7ef382b9024ac89676ebe6cbb26165a4f)
+ $(call
go-install-tool,$(LICENSEEYE),github.com/apache/skywalking-eyes/cmd/license-eye@21648e752a1dad42cb46b50b38e77f0a8f15219c)
.PHONY: license-check
license-check: licenseeye ## Check license header
diff --git a/hack/build/module.mk b/hack/build/module.mk
index 0cd67e7..115a1d2 100644
--- a/hack/build/module.mk
+++ b/hack/build/module.mk
@@ -23,7 +23,7 @@ tool_bin := $(root_dir)/bin
include $(root_dir)/hack/build/base.mk
-CONTROLLER_GEN_VERSION := v0.17.0
+CONTROLLER_GEN_VERSION := v0.19.0
KUSTOMIZE_VERSION := v4.5.6
GOLANGCI_LINT_VERSION := v1.63.4
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 7fe6ac1..66a7150 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
# Build the manager binary
-FROM golang:1.24 as builder
+FROM golang:1.25 AS builder
WORKDIR /workspace
# Copy the Go Modules manifests
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml
index 5897a1d..f008421 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: banyandbs.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -340,7 +340,6 @@ spec:
pod labels will be ignored. The default
value is empty.
The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -355,7 +354,6 @@ spec:
pod labels will be ignored. The default
value is empty.
The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -521,7 +519,6 @@ spec:
pod labels will be ignored. The default value
is empty.
The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -536,7 +533,6 @@ spec:
pod labels will be ignored. The default value
is empty.
The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -629,8 +625,8 @@ spec:
most preferred is the one with the greatest sum of
weights, i.e.
for each node that meets all of the scheduling
requirements (resource
request, requiredDuringScheduling anti-affinity
expressions, etc.),
- compute a sum by iterating through the elements of
this field and adding
- "weight" to the sum if the node has pods which
matches the corresponding podAffinityTerm; the
+ compute a sum by iterating through the elements of
this field and subtracting
+ "weight" from the sum if the node has pods which
matches the corresponding podAffinityTerm; the
node(s) with the highest sum are the most preferred.
items:
description: The weights of all of the matched
WeightedPodAffinityTerm
@@ -699,7 +695,6 @@ spec:
pod labels will be ignored. The default
value is empty.
The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -714,7 +709,6 @@ spec:
pod labels will be ignored. The default
value is empty.
The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -880,7 +874,6 @@ spec:
pod labels will be ignored. The default value
is empty.
The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -895,7 +888,6 @@ spec:
pod labels will be ignored. The default value
is empty.
The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
- This is a beta field and requires enabling
MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
@@ -1368,15 +1360,13 @@ spec:
volumeAttributesClassName may be used to set the
VolumeAttributesClass used by this claim.
If specified, the CSI driver will create or update
the volume with the attributes defined
in the corresponding VolumeAttributesClass. This
has a different purpose than storageClassName,
- it can be changed after the claim is created. An
empty string value means that no VolumeAttributesClass
- will be applied to the claim but it's not allowed
to reset this field to empty string once it is set.
- If unspecified and the PersistentVolumeClaim is
unbound, the default VolumeAttributesClass
- will be set by the persistentvolume controller if
it exists.
+ it can be changed after the claim is created. An
empty string or nil value indicates that no
+ VolumeAttributesClass will be applied to the
claim. If the claim enters an Infeasible error state,
+ this field can be reset to its previous value
(including nil) to cancel the modification.
If the resource referred to by
volumeAttributesClass does not exist, this PersistentVolumeClaim will be
set to a Pending state, as reflected by the
modifyVolumeStatus field, until such as a resource
exists.
More info:
https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
- (Beta) Using this field requires the
VolumeAttributesClass feature gate to be enabled (off by default).
type: string
volumeMode:
description: |-
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_eventexporters.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_eventexporters.yaml
index 1ca67cd..8b3c6e9 100644
---
a/operator/config/crd/bases/operator.skywalking.apache.org_eventexporters.yaml
+++
b/operator/config/crd/bases/operator.skywalking.apache.org_eventexporters.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: eventexporters.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_fetchers.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_fetchers.yaml
index b179da3..a2f475b 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_fetchers.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_fetchers.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: fetchers.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_javaagents.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_javaagents.yaml
index 9478048..d795e39 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_javaagents.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_javaagents.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: javaagents.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml
index c99af47..8682b51 100644
---
a/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml
+++
b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapserverconfigs.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -77,7 +77,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -135,6 +137,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_oapserverdynamicconfigs.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverdynamicconfigs.yaml
index 933eb27..1617e67 100644
---
a/operator/config/crd/bases/operator.skywalking.apache.org_oapserverdynamicconfigs.yaml
+++
b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverdynamicconfigs.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapserverdynamicconfigs.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml
index f7b59c5..c872f44 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapservers.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -85,7 +85,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -143,6 +145,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -336,8 +375,9 @@ spec:
present in a Container.
properties:
name:
- description: Name of the environment
variable. Must
- be a C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII
characters except '='.
type: string
value:
description: |-
@@ -395,6 +435,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env
file.
+ Requires the EnvFiles feature gate to
be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An
invalid key will prevent the pod from starting.
+ The keys defined within a source
may consist of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles
feature gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its
key must be defined. If the file or key
+ does not exist, then the env var
is not published.
+ If optional is set to true and the
specified key does not exist,
+ the environment variable will not
be set in the Pod's containers.
+
+ If optional is set to false and
the specified key does not exist,
+ an error will be returned during
Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from
which to select the file.
+ Must be relative and may not
contain the '..' path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume
mount
+ containing the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container:
only resources limits and requests
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml
index 118aae5..6985068 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: satellites.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -88,7 +88,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -146,6 +148,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml
index 9f2dc89..266f44f 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: storages.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -83,7 +83,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -141,6 +143,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
diff --git
a/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml
index 42b4a8a..3521dcc 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: swagents.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -88,8 +88,9 @@ spec:
in a Container.
properties:
name:
- description: Name of the environment variable. Must
be a
- C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters
except '='.
type: string
value:
description: |-
@@ -147,6 +148,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be
enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid
key will prevent the pod from starting.
+ The keys defined within a source may
consist of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must
be defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the
specified key does not exist,
+ the environment variable will not be set
in the Pod's containers.
+
+ If optional is set to false and the
specified key does not exist,
+ an error will be returned during Pod
creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the
'..' path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -219,7 +257,7 @@ spec:
Claims lists the names of resources, defined in
spec.resourceClaims,
that are used by this container.
- This is an alpha field and requires enabling the
+ This field depends on the
DynamicResourceAllocation feature gate.
This field is immutable. It can only be set for
containers.
diff --git a/operator/config/crd/bases/operator.skywalking.apache.org_uis.yaml
b/operator/config/crd/bases/operator.skywalking.apache.org_uis.yaml
index e776639..5682aca 100644
--- a/operator/config/crd/bases/operator.skywalking.apache.org_uis.yaml
+++ b/operator/config/crd/bases/operator.skywalking.apache.org_uis.yaml
@@ -20,7 +20,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: uis.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
diff --git a/operator/go.mod b/operator/go.mod
index 266fcfc..c308708 100644
--- a/operator/go.mod
+++ b/operator/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-swck/operator
-go 1.24.6
+go 1.25.3
require (
github.com/Masterminds/sprig/v3 v3.3.0
@@ -59,14 +59,15 @@ require (
go.uber.org/zap v1.27.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
- golang.org/x/crypto v0.36.0 // indirect
- golang.org/x/net v0.38.0 // indirect
+ golang.org/x/crypto v0.43.0 // indirect
+ golang.org/x/net v0.46.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
- golang.org/x/sync v0.12.0 // indirect
- golang.org/x/sys v0.31.0 // indirect
- golang.org/x/term v0.30.0 // indirect
- golang.org/x/text v0.23.0 // indirect
+ golang.org/x/sync v0.17.0 // indirect
+ golang.org/x/sys v0.37.0 // indirect
+ golang.org/x/term v0.36.0 // indirect
+ golang.org/x/text v0.30.0 // indirect
golang.org/x/time v0.9.0 // indirect
+ golang.org/x/tools v0.38.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
diff --git a/operator/go.sum b/operator/go.sum
index 1e6eeab..386fcd4 100644
--- a/operator/go.sum
+++ b/operator/go.sum
@@ -146,43 +146,43 @@ go.yaml.in/yaml/v3 v3.0.4/go.mod
h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod
h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod
h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod
h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod
h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod
h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
golang.org/x/oauth2 v0.27.0/go.mod
h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod
h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod
h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod
h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod
h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod
h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod
h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod
h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod
h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
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=
