From 2dd8f6a2c9edbdbf8c13a4206857527702149aab Mon Sep 17 00:00:00 2001
From: 1gtm <1gtm@appscode.com>
Date: Sat, 17 Aug 2024 06:45:59 +0000
Subject: [PATCH] Use Go 1.23

Signed-off-by: 1gtm <1gtm@appscode.com>
Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 .github/workflows/ci.yml | 6 +++---
 Makefile                 | 2 +-
 util/runtime_settings.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64d7f26a..827aa1c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,13 +16,13 @@ concurrency:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
 
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v1
         with:
-          go-version: '1.22'
+          go-version: '1.23'
         id: go
 
       - uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index c7af49da..16d5b5d1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
 BASEIMAGE_PROD   ?= gcr.io/distroless/static-debian12
 BASEIMAGE_DBG    ?= debian:bookworm
 
-GO_VERSION       ?= 1.22
+GO_VERSION       ?= 1.23
 BUILD_IMAGE      ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
 
 OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
diff --git a/util/runtime_settings.go b/util/runtime_settings.go
index 6d055275..d7954bc6 100644
--- a/util/runtime_settings.go
+++ b/util/runtime_settings.go
@@ -81,7 +81,7 @@ func ApplyContainerRuntimeSettings(container core.Container, settings ofst.Conta
 }
 
 func ApplyPodRuntimeSettings(podSpec core.PodSpec, settings ofst.PodRuntimeSettings) core.PodSpec {
-	if settings.NodeSelector != nil && len(settings.NodeSelector) > 0 {
+	if len(settings.NodeSelector) > 0 {
 		podSpec.NodeSelector = settings.NodeSelector
 	}
 	if settings.ServiceAccountName != "" {