From 5f6c0baae568377bac09ee60951a72c12740e378 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 20 May 2024 14:41:42 -0700 Subject: [PATCH 1/4] Update mimimal go version in go.mod to go1.22 --- go.mod | 2 +- test/agent/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2a203b9655..6de048bee1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-vpc-cni-k8s -go 1.21 +go 1.22 require ( github.com/apparentlymart/go-cidr v1.1.0 diff --git a/test/agent/go.mod b/test/agent/go.mod index db9ac45b64..f3c9d80eb6 100644 --- a/test/agent/go.mod +++ b/test/agent/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-vpc-cni-k8s/test/agent -go 1.21 +go 1.22 require ( github.com/coreos/go-iptables v0.7.0 From 5720e13cc5ef14bfdafbad1d46b6f1643f8ae4ef Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 20 May 2024 15:16:57 -0700 Subject: [PATCH 2/4] Updated Github workflows. --- .github/workflows/integration-tests.yaml | 2 +- .github/workflows/nightly-cron-tests.yaml | 2 +- .github/workflows/pr-automated-tests.yaml | 4 ++-- .github/workflows/pr-manual-tests.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/weekly-cron-tests.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index a284243c55..ba50c6d0b0 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/nightly-cron-tests.yaml b/.github/workflows/nightly-cron-tests.yaml index 095d8e94ac..0ac5f6b668 100644 --- a/.github/workflows/nightly-cron-tests.yaml +++ b/.github/workflows/nightly-cron-tests.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/pr-automated-tests.yaml b/.github/workflows/pr-automated-tests.yaml index a3fe113a3b..c34827f3c9 100644 --- a/.github/workflows/pr-automated-tests.yaml +++ b/.github/workflows/pr-automated-tests.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Set up tools run: | go install golang.org/x/lint/golint@latest @@ -50,7 +50,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Build CNI images run: make multi-arch-cni-build - name: Build CNI Init images diff --git a/.github/workflows/pr-manual-tests.yaml b/.github/workflows/pr-manual-tests.yaml index c50994a46e..0f84bbd6f6 100644 --- a/.github/workflows/pr-manual-tests.yaml +++ b/.github/workflows/pr-manual-tests.yaml @@ -29,7 +29,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d449df4213..93350c60e3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Generate CNI YAML run: make generate-cni-yaml - name: Create eks-charts PR diff --git a/.github/workflows/weekly-cron-tests.yaml b/.github/workflows/weekly-cron-tests.yaml index c12e9139d4..505526b46e 100644 --- a/.github/workflows/weekly-cron-tests.yaml +++ b/.github/workflows/weekly-cron-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" - name: Set up tools run: | # Install ginkgo version from go.mod From 21b01c84bea3aade56415ca8da997b325b4752e2 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Thu, 23 May 2024 00:50:17 -0700 Subject: [PATCH 3/4] Revert "Updated Github workflows." This reverts commit 5720e13cc5ef14bfdafbad1d46b6f1643f8ae4ef. --- .github/workflows/integration-tests.yaml | 2 +- .github/workflows/nightly-cron-tests.yaml | 2 +- .github/workflows/pr-automated-tests.yaml | 4 ++-- .github/workflows/pr-manual-tests.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/weekly-cron-tests.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index ba50c6d0b0..a284243c55 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/nightly-cron-tests.yaml b/.github/workflows/nightly-cron-tests.yaml index 0ac5f6b668..095d8e94ac 100644 --- a/.github/workflows/nightly-cron-tests.yaml +++ b/.github/workflows/nightly-cron-tests.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/pr-automated-tests.yaml b/.github/workflows/pr-automated-tests.yaml index c34827f3c9..a3fe113a3b 100644 --- a/.github/workflows/pr-automated-tests.yaml +++ b/.github/workflows/pr-automated-tests.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Set up tools run: | go install golang.org/x/lint/golint@latest @@ -50,7 +50,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Build CNI images run: make multi-arch-cni-build - name: Build CNI Init images diff --git a/.github/workflows/pr-manual-tests.yaml b/.github/workflows/pr-manual-tests.yaml index 0f84bbd6f6..c50994a46e 100644 --- a/.github/workflows/pr-manual-tests.yaml +++ b/.github/workflows/pr-manual-tests.yaml @@ -29,7 +29,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 93350c60e3..d449df4213 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Generate CNI YAML run: make generate-cni-yaml - name: Create eks-charts PR diff --git a/.github/workflows/weekly-cron-tests.yaml b/.github/workflows/weekly-cron-tests.yaml index 505526b46e..c12e9139d4 100644 --- a/.github/workflows/weekly-cron-tests.yaml +++ b/.github/workflows/weekly-cron-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: "1.22" + go-version: "1.21" - name: Set up tools run: | # Install ginkgo version from go.mod From b5bdcdfca002adea593b45ae0b992c608da8d0a4 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Thu, 23 May 2024 00:51:10 -0700 Subject: [PATCH 4/4] demo with simple update of go.mod. --- go.mod | 2 +- test/agent/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6de048bee1..16717c2606 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-vpc-cni-k8s -go 1.22 +go 1.22.3 require ( github.com/apparentlymart/go-cidr v1.1.0 diff --git a/test/agent/go.mod b/test/agent/go.mod index f3c9d80eb6..81506d3f38 100644 --- a/test/agent/go.mod +++ b/test/agent/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-vpc-cni-k8s/test/agent -go 1.22 +go 1.22.3 require ( github.com/coreos/go-iptables v0.7.0