Merge pull request kubernetes#111678 from dims/fix-things-commented-o…

…ut-in-1.19-rc2

[golang] Fix things commented out in 1.19rc2

.golangci.yaml

@@ -21,20 +21,18 @@ linters:
   # - structcheck
   # - varcheck
     - ineffassign
-  # TODO(golang): Need to fix this to work with golang 1.19
-  #  - logcheck
+    - logcheck
     - staticcheck
     - stylecheck
     - unused
 
 linters-settings: # please keep this alphabetized
-# TODO(golang): Need to fix this to work with golang 1.19
-#  custom:
-#    logcheck:
-#      # Installed there by hack/verify-golangci-lint.sh.
-#      path: _output/local/bin/logcheck.so
-#      description: structured logging checker
-#      original-url: k8s.io/klog/hack/tools
+  custom:
+    logcheck:
+      # Installed there by hack/verify-golangci-lint.sh.
+      path: _output/local/bin/logcheck.so
+      description: structured logging checker
+      original-url: k8s.io/klog/hack/tools
   staticcheck:
     go: "1.18"
     checks: [

build/dependencies.yaml

@@ -105,9 +105,8 @@ dependencies:
     version: 1.19
     refPaths:
     - path: build/build-image/cross/VERSION
-    # TODO(dims): Uncomment once images are updated to go1.19
-    #- path: hack/lib/golang.sh
-    #  match: minimum_go_version=go([0-9]+\.[0-9]+)
+    - path: hack/lib/golang.sh
+      match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "registry.k8s.io/kube-cross: dependents"
     version: v1.25.0-go1.19-bullseye.0

cmd/kube-scheduler/app/options/configfile.go

@@ -53,7 +53,7 @@ func loadConfig(data []byte) (*config.KubeSchedulerConfiguration, error) {
 		// more details.
 		cfgObj.TypeMeta.APIVersion = gvk.GroupVersion().String()
 		if cfgObj.TypeMeta.APIVersion == configv1beta2.SchemeGroupVersion.String() {
-			klog.Warning("KubeSchedulerConfiguration v1beta2 is deprecated in v1.25, will be removed in v1.26")
+			klog.InfoS("KubeSchedulerConfiguration v1beta2 is deprecated in v1.25, will be removed in v1.26")
 		}
 		return cfgObj, nil
 	}

hack/lib/golang.sh

@@ -482,8 +482,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
   local minimum_go_version
-  # TODO(dims): Need to switch this to 1.19 once we update images to newer go version
-  minimum_go_version=go1.18.1
+  minimum_go_version=go1.19
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     kube::log::usage_from_stdin <<EOF
 Detected go version: ${go_version[*]}.

hack/verify-golangci-lint.sh

@@ -39,8 +39,7 @@ export GO111MODULE=on
 echo "installing golangci-lint and logcheck plugin from hack/tools into ${GOBIN}"
 pushd "${KUBE_ROOT}/hack/tools" >/dev/null
   go install github.com/golangci/golangci-lint/cmd/golangci-lint
-# TODO(golang): Need to fix this to work with golang 1.19
-#  go build -o "${GOBIN}/logcheck.so" -buildmode=plugin sigs.k8s.io/logtools/logcheck/plugin
+  go build -o "${GOBIN}/logcheck.so" -buildmode=plugin sigs.k8s.io/logtools/logcheck/plugin
 popd >/dev/null
 
 cd "${KUBE_ROOT}"
@@ -55,8 +54,7 @@ cd "${KUBE_ROOT}"
 ## the configuration and running this script multiple times,
 ## otherwise golangci-lint will report stale results:
 ## _output/local/bin/golangci-lint cache clean
-# TODO(golang): Need to fix this to work with golang 1.19
-#export LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf"
+export LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf"
 
 echo 'running golangci-lint ' >&2
 res=0