This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch gov in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git
commit ac63fe3a1e0fa5f06b2fa6291277d1d67333a6cf Author: kezhenxu94 <[email protected]> AuthorDate: Thu Nov 6 11:33:51 2025 +0800 chore(deps): bump up go version --- .github/workflows/go.yml | 60 +++++++++------- adapter/go.mod | 2 +- operator/Dockerfile | 2 +- .../operator.skywalking.apache.org_banyandbs.yaml | 20 ++---- ...tor.skywalking.apache.org_oapserverconfigs.yaml | 41 ++++++++++- .../operator.skywalking.apache.org_oapservers.yaml | 83 +++++++++++++++++++++- .../operator.skywalking.apache.org_satellites.yaml | 41 ++++++++++- .../operator.skywalking.apache.org_storages.yaml | 41 ++++++++++- .../operator.skywalking.apache.org_swagents.yaml | 44 +++++++++++- operator/go.mod | 2 +- 10 files changed, 284 insertions(+), 52 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/go.mod b/adapter/go.mod index 80f4eeb..b603d2e 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 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..839afd2 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_banyandbs.yaml @@ -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_oapserverconfigs.yaml b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml index c99af47..2cc804a 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_oapserverconfigs.yaml @@ -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_oapservers.yaml b/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml index f7b59c5..bec26af 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_oapservers.yaml @@ -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..b837389 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_satellites.yaml @@ -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..a2d1b44 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_storages.yaml @@ -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..6a06ad4 100644 --- a/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml +++ b/operator/config/crd/bases/operator.skywalking.apache.org_swagents.yaml @@ -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/go.mod b/operator/go.mod index 266fcfc..1153b53 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
