From f9ea54de5f7ed31895dab57ad5cc62c27c836747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=88=E8=BE=B0?= Date: Sat, 8 Feb 2025 10:18:53 +0800 Subject: [PATCH] fix typo and dependency problem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 守辰 --- .github/workflows/ci.yaml | 5 ++-- .github/workflows/e2e-1.28.yaml | 6 ++--- .github/workflows/e2e-1.30.yaml | 6 ++--- go.mod | 26 +++++++++---------- go.sum | 4 +-- .../workloadspread_event_handler_test.go | 6 ++--- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b24d37c52..40396a0104 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,8 +129,9 @@ jobs: git status - name: Publish Unit Test Coverage uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: + token: ${{ secrets.CODECOV_TOKEN }} flags: unittests file: cover.out - - name: Check diff - run: '[[ -z $(git status -s) ]] || (printf "Existing modified/untracked files.\nPlease run \"make generate manifests\" and push again.\n"; exit 1)' diff --git a/.github/workflows/e2e-1.28.yaml b/.github/workflows/e2e-1.28.yaml index 2753dc6ac3..f0430496ab 100644 --- a/.github/workflows/e2e-1.28.yaml +++ b/.github/workflows/e2e-1.28.yaml @@ -413,15 +413,15 @@ jobs: clonesetAndInplace: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.12.0 + uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} diff --git a/.github/workflows/e2e-1.30.yaml b/.github/workflows/e2e-1.30.yaml index 755fa2a2bf..935cbe50fa 100644 --- a/.github/workflows/e2e-1.30.yaml +++ b/.github/workflows/e2e-1.30.yaml @@ -236,15 +236,15 @@ jobs: clonesetAndInplace: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: go-version: ${{ env.GO_VERSION }} - name: Setup Kind Cluster - uses: helm/kind-action@v1.10.0 + uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 with: node_image: ${{ env.KIND_IMAGE }} cluster_name: ${{ env.KIND_CLUSTER_NAME }} diff --git a/go.mod b/go.mod index 6edc449f41..2e1828db7f 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/runc v1.2.0-rc.1 // indirect + github.com/opencontainers/runc v1.2.0-rc.3 // indirect github.com/opencontainers/selinux v1.11.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -150,8 +150,10 @@ replace ( k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.9 k8s.io/apimachinery => k8s.io/apimachinery v0.30.9 k8s.io/apiserver => k8s.io/apiserver v0.30.9 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.9 k8s.io/client-go => k8s.io/client-go v0.30.9 k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.9 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.9 k8s.io/code-generator => k8s.io/code-generator v0.30.9 k8s.io/component-base => k8s.io/component-base v0.30.9 k8s.io/component-helpers => k8s.io/component-helpers v0.30.9 @@ -159,19 +161,17 @@ replace ( k8s.io/cri-api => k8s.io/cri-api v0.30.9 k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.9 k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.9 + k8s.io/endpointslice => k8s.io/endpointslice v0.30.9 k8s.io/kms => k8s.io/kms v0.30.9 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.9 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.9 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.9 k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.9 + k8s.io/kubectl => k8s.io/kubectl v0.30.9 k8s.io/kubelet => k8s.io/kubelet v0.30.9 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.9 + k8s.io/metrics => k8s.io/metrics v0.30.9 k8s.io/mount-utils => k8s.io/mount-utils v0.30.9 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.9 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.9 - k8s.io/endpointslice => k8s.io/endpointslice v0.30.9 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.9 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.9 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.9 - k8s.io/kubectl => k8s.io/kubectl v0.30.9 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.9 - k8s.io/metrics => k8s.io/metrics v0.30.9 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.9 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.9 -) \ No newline at end of file + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.9 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.9 +) diff --git a/go.sum b/go.sum index 89017f7abc..5ecae3d2e8 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/runc v1.2.0-rc.1 h1:SMjop2pxxYRTfKdsigna/8xRoaoCfIQfD2cVuOb64/o= -github.com/opencontainers/runc v1.2.0-rc.1/go.mod h1:m9JwxfHzXz5YTTXBQr7EY9KTuazFAGPyMQx2nRR3vTw= +github.com/opencontainers/runc v1.2.0-rc.3 h1:5vQhejBp4S5w1DwFZ7L3CSOQX9cmcc8JKFy/mOBTJlo= +github.com/opencontainers/runc v1.2.0-rc.3/go.mod h1:HADgqJU4nqAmOpe+uYBTJ4ZRvjks3ptCjKXp1pHqmCc= github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/controller/workloadspread/workloadspread_event_handler_test.go b/pkg/controller/workloadspread/workloadspread_event_handler_test.go index b82071a8f4..1ae77be0f2 100644 --- a/pkg/controller/workloadspread/workloadspread_event_handler_test.go +++ b/pkg/controller/workloadspread/workloadspread_event_handler_test.go @@ -171,7 +171,7 @@ func TestPodEventHandler(t *testing.T) { key, _ := createQ.Get() nsn, _ := key.(reconcile.Request) if nsn.Namespace != createPod.Namespace && nsn.Name != injectWorkloadSpread.Name { - t.Errorf("matche WorkloadSpread %s/%s failed", createPod.Namespace, injectWorkloadSpread.Name) + t.Errorf("matching WorkloadSpread %s/%s failed", createPod.Namespace, injectWorkloadSpread.Name) } // update @@ -201,7 +201,7 @@ func TestPodEventHandler(t *testing.T) { key, _ = updateQ.Get() nsn, _ = key.(reconcile.Request) if nsn.Namespace != newPod.Namespace && nsn.Name != injectWorkloadSpread.Name { - t.Errorf("matche WorkloadSpread %s/%s failed", newPod.Namespace, injectWorkloadSpread.Name) + t.Errorf("matching WorkloadSpread %s/%s failed", newPod.Namespace, injectWorkloadSpread.Name) } // delete @@ -224,7 +224,7 @@ func TestPodEventHandler(t *testing.T) { key, _ = deleteQ.Get() nsn, _ = key.(reconcile.Request) if nsn.Namespace != deletePod.Namespace && nsn.Name != injectWorkloadSpread.Name { - t.Errorf("matche WorkloadSpread %s/%s failed", deletePod.Namespace, injectWorkloadSpread.Name) + t.Errorf("matching WorkloadSpread %s/%s failed", deletePod.Namespace, injectWorkloadSpread.Name) } }