Skip to content

Commit cff198e

Browse files
alphanotaalphanota
authored
chore: bump go version to 1.24.1 (#9772)
* chore: bump go version to 1.24.1 * upgrade golangci-lint to a go 1.24 compatible version * upgrade logrus analyzer go.mod * fix: update the test crypto key data - the 1.24 version of the crypto/x509 package appears to have changes that made older pem files un-parseable. * fix: ignore unexported sync.Mutex field when comparing portForwardEntry * chore: upgrade go version in various other files
1 parent 8f54a97 commit cff198e

16 files changed

+747
-87
lines changed

‎.github/workflows/integration-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set up Go
3636
uses: actions/setup-go@v5
3737
with:
38-
go-version: 1.23.*
38+
go-version: 1.24.1
3939
id: go
4040

4141
- name: Set up Java

‎.github/workflows/linters-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.23.*
20+
go-version: 1.24.1
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/unit-tests-darwin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.23.*
26+
go-version: 1.24.1
2727
id: go
2828

2929
# Retrieve build locations with `go env`

‎.github/workflows/unit-tests-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.23.*
20+
go-version: 1.24.1
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/unit-tests-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@v5
2626
with:
27-
go-version: 1.23.*
27+
go-version: 1.24.1
2828
id: go
2929

3030
# Retrieve build locations with `go env`

‎.github/workflows/verify-examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.23.*
26+
go-version: 1.24.1
2727
id: go
2828

2929
# Skip changes not affecting examples or integration/examples

‎deploy/skaffold/Dockerfile.deps

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
162162
jq \
163163
apt-transport-https && \
164164
rm -rf /var/lib/apt/lists/*
165-
COPY --from=golang:1.23.5 /usr/local/go /usr/local/go
165+
COPY --from=golang:1.24.1 /usr/local/go /usr/local/go
166166
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleContainerTools/skaffold/v2
22

3-
go 1.23.4
3+
go 1.24.1
44

55
// broken on Windows, see https://github.com/karrick/godirwalk/issues/70
66
exclude github.com/karrick/godirwalk v1.17.0

‎hack/golangci-lint.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -e -o pipefail
1818

1919
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2020
BIN=${DIR}/bin
21-
VERSION=1.62.0
21+
VERSION=1.64.8
2222

2323
function install_linter() {
2424
echo "Installing GolangCI-Lint"
@@ -36,7 +36,7 @@ then
3636
install_linter
3737
fi
3838

39-
FLAGS="--skip-dirs fs/assets/credits_generated"
39+
FLAGS="--exclude-dirs fs/assets/credits_generated"
4040
if [[ "${CI}" == "true" ]]; then
4141
FLAGS="$FLAGS -v --print-resources-usage"
4242
fi
@@ -56,4 +56,3 @@ if ! [ -x "$(command -v ${BIN}/logrus-analyzer)" ] ; then
5656
fi
5757
# This analyzer doesn't support any flags currently, so we don't include ${FLAGS}
5858
${BIN}/logrus-analyzer github.com/GoogleContainerTools/skaffold/v2{/pkg,/cmd,/diag}...
59-

‎hack/tools/go.mod

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
module tools
22

3-
go 1.23
3+
go 1.24.1
4+
45
require (
5-
github.com/corneliusweig/release-notes v0.0.0-20191014214505-0be5c7c66752
6-
golang.org/x/tools v0.19.0
6+
github.com/corneliusweig/release-notes v0.1.4
7+
golang.org/x/tools v0.31.0
78
)
89

910
require (
10-
github.com/golang/protobuf v1.2.0 // indirect
11+
github.com/golang/protobuf v1.5.4 // indirect
1112
github.com/google/go-github/v28 v28.1.1 // indirect
12-
github.com/google/go-querystring v1.0.0 // indirect
13-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
14-
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
15-
github.com/sirupsen/logrus v1.4.2 // indirect
16-
github.com/spf13/cobra v0.0.5 // indirect
17-
github.com/spf13/pflag v1.0.3 // indirect
18-
golang.org/x/crypto v0.35.0 // indirect
19-
golang.org/x/mod v0.16.0 // indirect
20-
golang.org/x/net v0.36.0 // indirect
21-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
22-
golang.org/x/sys v0.30.0 // indirect
23-
google.golang.org/appengine v1.4.0 // indirect
13+
github.com/google/go-querystring v1.1.0 // indirect
14+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
15+
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
16+
github.com/sirupsen/logrus v1.9.3 // indirect
17+
github.com/spf13/cobra v1.9.1 // indirect
18+
github.com/spf13/pflag v1.0.6 // indirect
19+
golang.org/x/crypto v0.36.0 // indirect
20+
golang.org/x/mod v0.24.0 // indirect
21+
golang.org/x/net v0.38.0 // indirect
22+
golang.org/x/oauth2 v0.28.0 // indirect
23+
golang.org/x/sync v0.12.0 // indirect
24+
golang.org/x/sys v0.31.0 // indirect
25+
google.golang.org/appengine v1.6.8 // indirect
2426
)

‎hack/tools/go.sum

+604
Large diffs are not rendered by default.

‎pkg/skaffold/docker/testdata/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The *.pem files in this testdata was generated by
2+
following instructions in:
3+
https://docs.docker.com/engine/security/protect-access/#use-tls-https-to-protect-the-docker-daemon-socket

‎pkg/skaffold/docker/testdata/ca.pem

+29-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICzDCCAbSgAwIBAgIRAO7ZvKht5o7wKbCYNFi0qSgwDQYJKoZIhvcNAQELBQAw
3-
DzENMAsGA1UEChMEbWF0dDAeFw0xNzA1MDIwNTU4MDBaFw0yMDA0MTYwNTU4MDBa
4-
MA8xDTALBgNVBAoTBG1hdHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
5-
AQCwse3SjINkrA4RyqDyufpMVfdHjCZ75tUZUTlbAUfIr3UDMHE8qCudyJttXrt5
6-
AXRejxq/pyNZgBzr8cnL4DaExChhpvxV6MWE069WEOhjd2wEg6vlAxDOc34izDQ3
7-
dR4uv0AF7rA23akk+3IKiTLisMtRVw7YiN0gEIAhrK4kfaTggy7Y8MNIDeYIe4AT
8-
KAdAIVpLVe8EAdOzCl+RbBifkl8s3G+weeOtfQh0Gfk3pprXov4A/p9gydUtpNo5
9-
C6mTCkRCMcMj6ABWdyFgUu6A0BvdpaIGs3SlvQKsgtNhfs8OmjWJtjBlb3K3o0wY
10-
vR+iu1X7dubo7G82bP1h0hNnAgMBAAGjIzAhMA4GA1UdDwEB/wQEAwICrDAPBgNV
11-
HRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCrLNLeIOLihGovt+ITXK3P
12-
O8yCrfnh6F42oXsalP+SooW494WKKuB1fe4V9ORjbsGy3bL5HJ6D1K+QvqfWIzmk
13-
/Rr+EoVACTRyoM9HCvDh7zlW/D737x/DdlZW7XX5PE9vYdy5FN5ghwrYwLm4DcAZ
14-
ta+Ta6VtnvuN0jx3vnNgl4HmvQpA8dZBOOZOTGaez6LgShoZqrXezjTytP0OgUAW
15-
OLM2cc3138DozPjeUwvCLjY6Csi2ZOfFRCZ0JEffZghAc0PvIb/QQKkQRlDCwfBR
16-
JHUbWzr80k6wwGKHWb929XYPg8INj4amD/+/HHWlVz4DfIycqaoy5IV6WOAjHbza
2+
MIIFazCCA1OgAwIBAgIUdmUndvDCf9T5aJollbBGYieck/cwDQYJKoZIhvcNAQEL
3+
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
4+
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNTAzMjcyMTAyNTNaFw0yNTA0
5+
MjYyMTAyNTNaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
6+
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggIiMA0GCSqGSIb3DQEB
7+
AQUAA4ICDwAwggIKAoICAQDO0wJzrYCqj2jhFkDwdMSANZMnJ+dLbP3+JVlS1+Zg
8+
zfNn9ZtC6hesMg44zyWGAPPT3C80pdODIUgJ+c0vb6RXxCqT8R7aU+6NQJtuPpNX
9+
SDF01XlPeHwp48rhYvJWqK8VQ9IIxjhEFlJWCVh4q0HGTz5EMW+f1ckUiHMWdKeE
10+
XXBPROlY5wnbRvqIofcS0yOIPwHvB8bk48rwhZ67oyFbExkQBKIsDfIiVdheN7j3
11+
lbvMnyZPXAcP2LhoWf1WCoC1M4NhvcHj0Q+oZsX3UpjZKp0bGx5j7Za9RsNQcnGa
12+
5FeqblvNaarzsu+SimnqG5i0xoL1+MV5bLwpTNKywCr1oM7Q8LibRGHyKYFAMevV
13+
Zag4SbwETwlHRgKLFR1fFGBojga0mVrbToMLChL+Dzpax3vQNRrK+JHM9cCHace6
14+
zNreLZlM/9sWHjXsfE6IebW3iN9mbF8A3Ehmn11EXjOh5QO9czMGoanqHWffvoXb
15+
c9mCKOYnrgpxsPyVBrnSumoVIYCgXgwKch02GCWdmIk7d1TavT61ZJ1NwRQHiT/8
16+
rI3zLdEZm9jKL2zDyFOy3Nnc9AXA2qw2cvTyn6yjHcY9EAwkrym50xtanVfHSv/T
17+
DSzHTVpNNA1RdbnZaxEXZCJjAo3cQyQ+gYriMx5COtTfuJMVI3rtt1E4+BMN+xLD
18+
UQIDAQABo1MwUTAdBgNVHQ4EFgQUFRyVRhuh4YVhtAthke0Mua0YNsEwHwYDVR0j
19+
BBgwFoAUFRyVRhuh4YVhtAthke0Mua0YNsEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
20+
hkiG9w0BAQsFAAOCAgEAvv9nn/oMu+xcnUdhkHs45gvm2QQCV2ScjgyB74kjqgzo
21+
E5a+vPuRgbkvpCg5PomCVgn/BmLGwawDVYGpoOlaIEwR9+iqh6phCKT/2a3Th2NG
22+
eNhhYpG0J5OlYxU5ifwUQJ5occbORfSB95yQT1/upKSee50OVnjA2T700Kwmbe47
23+
6knW+/b9sPyEDAAzNEGXWUnv2pf7MYRVUSI4vkLUzNlUL3hADe4rC+Jj9iQal5tV
24+
kDzQsRfcVhG+qzbgDVTvKsAXoud7l7N4UwKZ4ezOt6FJJa39UfvII18SM5BCz0Cw
25+
KWQnq7USn1p2n+948bkGoZF4Qqar3aFkpBF8GmAbLGffO7NQqQDt6744NNUQpWfa
26+
0jwsas9JccBAZBrKLaJHfVlkbppF1AvlR9kPuYVCeQiJ+LbU8RuKenQUgtxKPELn
27+
/4KsIOlQPs4nx7hO27myxcOw/AYwj+Qt+osdK8k56iK9mO0lMrAJ1WLdQjlY6gM+
28+
Rlp2zanbXDDB4yzjiuCDyHdGp3sKr5z/AsCvvPXB+ypoxDXUyXMllwNdPIyBFskM
29+
T6BxUlYEl+yd2Wvan2ApoYol0i7+nWDSk9mLnBvkNboy7rKX/8RYyAim5sgQV0US
30+
VfMWhTL879yS9Qb1157PtDtp4ouU7gZCfWeF3rQvls/EzmHroum2rhQZUIRGq3c=
1731
-----END CERTIFICATE-----

‎pkg/skaffold/docker/testdata/cert.pem

+29-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
-----BEGIN CERTIFICATE-----
2-
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
1831
-----END CERTIFICATE-----

‎pkg/skaffold/docker/testdata/key.pem

+52-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,52 @@
1-
2-
-----BEGIN RSA PRIVATE KEY-----
3-
MIIEowIBAAKCAQEApotHCours2tk4cGImqlNcTFK0edbOppqZYrCqrcCEiXosgqi
4-
z/VvIKqVhFLVjYaq71pf7F3h02JeoJ1lX0GLEVHH68ly5xxpdeM3SA0HUCzWzzQG
5-
aGIem5+oVgGnmAroJv/UoRMjrXj3TiPm6RK7YgTGqb5H5f60WLZzCUOaYUGTy1Z/
6-
iZxkn7+Jigx9I8VRUYk/DfUaIgXyKpViOPtSrBIlPziLHj9WrAPuCb9yutrgM3o4
7-
qmA7Gk3FCvxYQwo0AWGxJwib41iiUNfuoWkx/IcZfBNmsNPPAa7sRYUaHel6gPjj
8-
J1YTuQYtRwJ1apWixjxccUDqruio1aEAQR2fuQIDAQABAoIBACD+xvxX35SUWlA/
9-
v4iksisS0Pf1FiXuIdYsP5UC3O4rhIaBhPAed/3IzgaBQr3fSE5TYV2629q9SnIX
10-
vNW6born4Ovd5V3USzCH65PiwOgpegVjEUHs7pN2ditT+Jgu0P+o/79Jw2/C33wj
11-
sMPMakNpHtLSV/xBEgnhW7kiI5vQyFZx5bZ5L9uKBSH1Xkv8nAsdqmObtg26rjej
12-
jQVfzxZWRzHR1D11aFPmRPKzcjDFtPHdz8u93f7S5BZwucgQmCJDs5WvUGJaPDZ0
13-
CYnNLhVhwcJqmpv7+qus1dR+8vfhOLYFrAM0ttnEH3fO5cgD2lY9vH1it9iFXNMe
14-
XiEAw2ECgYEA1B1T1x0BgVUT5pd45MQs6TC/NTDKkcdxe0/1ED4J4QPhJIq0jjmn
15-
i6TG6AJDUwfMQMrHvuwra6HCAWndTC5zhGBBCwX2TZbO/Ytqm7aMCR5nOsbIbOFD
16-
vN6mxTbqG80EEIQb6MnPxB21J9xQBl0r1sd2ydSoRmMyzMTyoSLJ0kcCgYEAyQBN
17-
f7jPwt0CYE5T3b/BQkcVpEJPaMdmpN2+/HiPj9IK4VB+MKStwvVI1jeV5UFVfVje
18-
m5/3u9HOHLjYECp3c3oXivjK5Byxa6iOmws5b3s6s5Cc5c58idzZv9+qJXTvLomX
19-
sXm+lLk6ICdgnjxipwtjkSFsNz0Ypw65tCYT/f8CgYBw6ffCkE9H0MlaPBH//apG
20-
rEts/j8nYTs4wHSdI9lQbidAs5GwEGLvRFUaFnJOVd1WNFwmd0QZ9K7436kNL8EQ
21-
m8ikHJVj8j7X24pxv7hF9mhPcpgo1bWgagnu+++dwwJB5IGS5zNxm7resDntWVXH
22-
7MCAanL1nULinIjoXEOBawKBgQDIyumghsHduyTNilHTeuSXziU7cxaa6F+MoQxS
23-
cCmSFdTSorN86nW/BYOeo+a1H6BEWMwAkTxMv1l0bd9BvvqXPEdaiBE+8b73emoD
24-
TqIw0NyiVvu1wqG8owhP2iLByl/JkKAeJi2Rqrv7NPsa993hW8o6SDYvtHP1Jwuy
25-
gDuGhwKBgA4QcOQ56phaeXZW9UXED0Of3SW8PNEG6kQ+E1xcLBpoegXiYNhTeSOU
26-
EthSfYOk3Q+9uHC2o4HEqhAa7d2uU6MwU487NPzaHTkTj4DEAXbqJ1+k9X9RZnth
27-
WAaP2kjB042LxRawzSPke9pSFRpJKvGIBvvxhrozbjbc+Yl11uxb
28-
-----END RSA PRIVATE KEY-----
1+
-----BEGIN PRIVATE KEY-----
2+
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
51+
lmZuWWaaBnVKYInYN8A9WPwAKjLY
52+
-----END PRIVATE KEY-----

‎pkg/skaffold/kubernetes/portforward/resource_forwarder_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"time"
2626

2727
"github.com/google/go-cmp/cmp"
28+
"github.com/google/go-cmp/cmp/cmpopts"
2829
v1 "k8s.io/api/core/v1"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3031
"k8s.io/apimachinery/pkg/runtime"
@@ -218,7 +219,7 @@ func TestGetCurrentEntryFunc(t *testing.T) {
218219

219220
expectedEntry := test.expected
220221
expectedEntry.resource = test.resource
221-
t.CheckDeepEqual(expectedEntry, actualEntry, cmp.AllowUnexported(portForwardEntry{}, sync.Mutex{}))
222+
t.CheckDeepEqual(expectedEntry, actualEntry, cmp.AllowUnexported(portForwardEntry{}), cmpopts.IgnoreUnexported(sync.Mutex{}))
222223
})
223224
}
224225
}

0 commit comments

Comments
 (0)