Merge pull request #1573 from saschagrunert/go-1.23

Switch to go 1.23
kubernetes-sigs · Aug 16, 2024 · 1f2b3b8 · 1f2b3b8
2 parents 3584284 + ee88eaf
commit 1f2b3b8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: false
 
       - name: Set env
@@ -77,7 +77,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: false
 
       - name: Set env

diff --git a/.github/workflows/containerd.yml b/.github/workflows/containerd.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: false
 
       - name: Set env

diff --git a/.github/workflows/crio.yml b/.github/workflows/crio.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
 
       - name: Setup system
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - run: make release-notes release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

diff --git a/Makefile b/Makefile
@@ -113,7 +113,7 @@ install.lint: $(GOLANGCI_LINT)
 
 $(GOLANGCI_LINT):
 	export \
-		VERSION=v1.59.1 \
+		VERSION=v1.60.1 \
 		URL=https://raw.githubusercontent.com/golangci/golangci-lint \
 		BINDIR=${BUILD_BIN_PATH} && \
 	curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION

diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module sigs.k8s.io/cri-tools
 
-go 1.22.0
-
-toolchain go1.22.1
+go 1.23.0
 
 require (
 	github.com/distribution/reference v0.6.0

diff --git a/pkg/common/file.go b/pkg/common/file.go
@@ -81,7 +81,7 @@ func WriteConfig(c *Config, filepath string) error {
 func getConfigOptions(yamlData *yaml.Node) (*Config, error) {
 	config := &Config{yamlData: yamlData}
 
-	if yamlData.Content == nil || len(yamlData.Content) == 0 ||
+	if len(yamlData.Content) == 0 ||
 		yamlData.Content[0].Content == nil {
 		return config, nil
 	}
@@ -142,7 +142,7 @@ func setConfigOptions(config *Config) {
 
 // Set config option on yaml.
 func setConfigOption(configName, configValue string, yamlData *yaml.Node) {
-	if yamlData.Content == nil || len(yamlData.Content) == 0 {
+	if len(yamlData.Content) == 0 {
 		yamlData.Kind = yaml.DocumentNode
 		yamlData.Content = make([]*yaml.Node, 1)
 		yamlData.Content[0] = &yaml.Node{