scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[golang] Fix things commented out in 1.19rc2

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2022-08-03 22:10:47 -04:00
parent 305ad47627
commit a2408f39c7
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hack/lib/golang.sh
View File

@@ -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[*]}.

6
hack/verify-golangci-lint.sh
View File

@@ -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