diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-28 21:24:20 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-29 09:13:03 +0800 |
| commit | 11a6a484a663f456dd9932e0889e74f54eb3fe6e (patch) | |
| tree | ca5a0ac0cbb1dbca4cb138fe3fbdf4cc5f97c613 | |
| parent | update vendor for k8s v1.24.17 (diff) | |
| download | kubeedge-11a6a484a663f456dd9932e0889e74f54eb3fe6e.tar.gz | |
update version for k8s v1.24.17
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| -rw-r--r-- | .github/workflows/main.yaml | 6 | ||||
| -rw-r--r-- | common/constants/default.go | 2 | ||||
| -rw-r--r-- | edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 462d2019b..a1efbc234 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -186,7 +186,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.14.0 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.14/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v3 @@ -248,7 +248,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.14.0 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.14/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v3 @@ -295,7 +295,7 @@ jobs: run: | command -v ginkgo || go install github.com/onsi/ginkgo/ginkgo@${{ env.GINKGO_VERSION }} go install sigs.k8s.io/kind@v0.14.0 - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.14/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl + curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl - name: Checkout code uses: actions/checkout@v3 diff --git a/common/constants/default.go b/common/constants/default.go index 2b5134bc3..ae843937c 100644 --- a/common/constants/default.go +++ b/common/constants/default.go @@ -79,7 +79,7 @@ const ( DefaultTunnelPort = 10004 DefaultClusterDomain = "cluster.local" - CurrentSupportK8sVersion = "v1.24.14" + CurrentSupportK8sVersion = "v1.24.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 987873f66..1e3fdf67e 100644 --- a/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go +++ b/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go @@ -48,11 +48,10 @@ func (c *ServiceAccountsBridge) CreateToken(ctx context.Context, serviceAccountN } func (c *ServiceAccountsBridge) Delete(ctx context.Context, podUID string, opts metav1.DeleteOptions) error { - c.MetaClient.ServiceAccountToken().DeleteServiceAccountToken(types.UID(podUID)) - return nil + c.MetaClient.ServiceAccountToken().DeleteServiceAccountToken(types.UID(podUID)) + return nil } func (c *ServiceAccountsBridge) Get(ctx context.Context, name string, options metav1.GetOptions) (result *corev1.ServiceAccount, err error) { return c.MetaClient.ServiceAccounts(c.ns).Get(name) } - |