diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-27 17:24:44 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-27 17:33:07 +0800 |
| commit | ba5b288fddaefcb3e2ba9a53029750ae8a98d4f5 (patch) | |
| tree | b5998697f760bb8bf58ccdbca0abf54b5e5c2081 | |
| parent | delete serviceaccount token in edgedb (diff) | |
| download | kubeedge-ba5b288fddaefcb3e2ba9a53029750ae8a98d4f5.tar.gz | |
update version for k8s v1.22.17
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| -rw-r--r-- | .github/workflows/main.yaml | 6 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | common/constants/default.go | 2 | ||||
| -rw-r--r-- | edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index fe9f61c2d..7f31d64ca 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -161,7 +161,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/v2/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.11.1 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.6/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v2 @@ -219,7 +219,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/v2/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.11.1 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.6/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v2 @@ -266,7 +266,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/v2/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.11.1 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.6/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml index 2571e6c67..cf1ff4744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,6 @@ jobs: before_script: - command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@latest - go install sigs.k8s.io/kind@v0.11.1 - - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.6/bin/linux/arm64/kubectl && sudo install kubectl /usr/local/bin/kubectl + - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.22.17/bin/linux/arm64/kubectl && sudo install kubectl /usr/local/bin/kubectl script: - make e2e diff --git a/common/constants/default.go b/common/constants/default.go index 669023dec..70f9897f0 100644 --- a/common/constants/default.go +++ b/common/constants/default.go @@ -66,7 +66,7 @@ const ( DefaultVolumeStatsAggPeriod = time.Minute DefaultTunnelPort = 10004 - CurrentSupportK8sVersion = "v1.22.6" + CurrentSupportK8sVersion = "v1.22.17" // MetaManager DefaultRemoteQueryTimeout = 60 diff --git a/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go b/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go index 20ec9887a..278f1c0a1 100644 --- a/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go +++ b/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go @@ -50,4 +50,3 @@ func (c *ServiceAccountsBridge) Delete(ctx context.Context, podUID string, opts c.MetaClient.ServiceAccountToken().DeleteServiceAccountToken(types.UID(podUID)) return nil } - |