Skip to content

Commit e7f558c

Browse files
committed
Update go version and depedencies
Changes: - Update go version to 1.24.6 - Update dependencies to mitigate CVEs - Fix tests to work with broken APIs after update - Remove/Replace deprecated methods - Update Git command to ignore pre-commit hooks - Update Go builder image to 1.24 in docker files and Openshift CI Signed-off-by: Sayan Biswas <[email protected]>
1 parent 45635f9 commit e7f558c

File tree

539 files changed

+9996
-8958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+9996
-8958
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-golang-1.23-openshift-4.19
4+
tag: rhel-9-golang-1.24-openshift-4.20

.tekton/source-to-image-rhel8-pull-request.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ spec:
4040
value: "true"
4141
- name: run-unit-test
4242
value: "true"
43+
- name: unit-test-base-image
44+
value: registry.redhat.io/ubi9/go-toolset:1.24
45+
- name: unit-test-command
46+
value: make test
4347
- name: build-platforms
4448
value:
4549
- linux/x86_64
@@ -141,11 +145,11 @@ spec:
141145
- description: The command used to run the unit test
142146
name: unit-test-command
143147
type: string
144-
default: make test
148+
default: ""
145149
- description: The base image used to run the unit tests
146150
name: unit-test-base-image
147151
type: string
148-
default: registry.redhat.io/ubi9/go-toolset:1.23
152+
default: ""
149153
- default: docker
150154
description: The format for the resulting image's mediaType. Valid values are oci (default) or docker.
151155
name: buildah-format

.tekton/source-to-image-rhel8-push.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ spec:
3737
value: "true"
3838
- name: run-unit-test
3939
value: "true"
40+
- name: unit-test-base-image
41+
value: registry.redhat.io/ubi9/go-toolset:1.24
42+
- name: unit-test-command
43+
value: make test
4044
- name: build-platforms
4145
value:
4246
- linux/x86_64
@@ -140,11 +144,11 @@ spec:
140144
- description: The command used to run the unit test
141145
name: unit-test-command
142146
type: string
143-
default: make test
147+
default: ""
144148
- description: The base image used to run the unit tests
145149
name: unit-test-base-image
146150
type: string
147-
default: registry.redhat.io/ubi9/go-toolset:1.23
151+
default: ""
148152
- default: docker
149153
description: The format for the resulting image's mediaType. Valid values are oci (default) or docker.
150154
name: buildah-format

.tekton/source-to-image-rhel9-pull-request.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ spec:
4040
value: "true"
4141
- name: run-unit-test
4242
value: "true"
43+
- name: unit-test-base-image
44+
value: registry.redhat.io/ubi9/go-toolset:1.24
45+
- name: unit-test-command
46+
value: make test
4347
- name: build-platforms
4448
value:
4549
- linux/x86_64
@@ -141,11 +145,11 @@ spec:
141145
- description: The command used to run the unit test
142146
name: unit-test-command
143147
type: string
144-
default: make test
148+
default: ""
145149
- description: The base image used to run the unit tests
146150
name: unit-test-base-image
147151
type: string
148-
default: registry.redhat.io/ubi9/go-toolset:1.23
152+
default: ""
149153
- default: docker
150154
description: The format for the resulting image's mediaType. Valid values are oci (default) or docker.
151155
name: buildah-format

.tekton/source-to-image-rhel9-push.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ spec:
3737
value: "true"
3838
- name: run-unit-test
3939
value: "true"
40+
- name: unit-test-base-image
41+
value: registry.redhat.io/ubi9/go-toolset:1.24
42+
- name: unit-test-command
43+
value: make test
4044
- name: build-platforms
4145
value:
4246
- linux/x86_64
@@ -140,11 +144,11 @@ spec:
140144
- description: The command used to run the unit test
141145
name: unit-test-command
142146
type: string
143-
default: make test
147+
default: ""
144148
- description: The base image used to run the unit tests
145149
name: unit-test-base-image
146150
type: string
147-
default: registry.redhat.io/ubi9/go-toolset:1.23
151+
default: ""
148152
- default: docker
149153
description: The format for the resulting image's mediaType. Valid values are oci (default) or docker.
150154
name: buildah-format

.tekton/source-to-image-unit-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
- description: The Go base image used to run the unit tests
2020
name: BASE_IMAGE
2121
type: string
22-
default: registry.redhat.io/ubi9/go-toolset:1.23
22+
default: registry.redhat.io/ubi9/go-toolset:1.24
2323
stepTemplate:
2424
volumeMounts:
2525
- mountPath: /var/workdir

go.mod

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
module github.com/openshift/source-to-image
22

3-
go 1.23.3
4-
5-
toolchain go1.23.9
3+
go 1.24.6
64

75
require (
8-
github.com/containers/image/v5 v5.35.0
6+
github.com/containerd/errdefs v1.0.0
7+
github.com/containers/image/v5 v5.36.2
98
github.com/distribution/reference v0.6.0
10-
github.com/docker/docker v28.1.1+incompatible
11-
github.com/docker/go-connections v0.5.0
9+
github.com/docker/docker v28.5.2+incompatible
10+
github.com/docker/go-connections v0.6.0
1211
github.com/go-imports-organizer/goio v1.5.0
13-
github.com/moby/buildkit v0.22.0
12+
github.com/moby/buildkit v0.26.0
13+
github.com/moby/docker-image-spec v1.3.1
1414
github.com/opencontainers/image-spec v1.1.1
15-
github.com/spf13/cobra v1.9.1
16-
github.com/spf13/pflag v1.0.6
17-
golang.org/x/net v0.40.0
15+
github.com/spf13/cobra v1.10.1
16+
github.com/spf13/pflag v1.0.10
17+
golang.org/x/net v0.47.0
1818
k8s.io/klog/v2 v2.130.1
1919
)
2020

2121
require (
22-
dario.cat/mergo v1.0.1 // indirect
22+
dario.cat/mergo v1.0.2 // indirect
2323
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2424
github.com/BurntSushi/toml v1.5.0 // indirect
2525
github.com/Microsoft/go-winio v0.6.2 // indirect
26-
github.com/Microsoft/hcsshim v0.12.9 // indirect
27-
github.com/containerd/cgroups/v3 v3.0.5 // indirect
28-
github.com/containerd/errdefs v1.0.0 // indirect
26+
github.com/Microsoft/hcsshim v0.14.0-rc.1 // indirect
27+
github.com/containerd/cgroups/v3 v3.1.0 // indirect
2928
github.com/containerd/errdefs/pkg v0.3.0 // indirect
30-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
29+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
3130
github.com/containerd/typeurl/v2 v2.2.3 // indirect
3231
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
3332
github.com/containers/ocicrypt v1.2.1 // indirect
34-
github.com/containers/storage v1.58.0 // indirect
33+
github.com/containers/storage v1.59.1 // indirect
3534
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
3635
github.com/docker/distribution v2.8.3+incompatible // indirect
3736
github.com/docker/docker-credential-helpers v0.9.3 // indirect
@@ -47,10 +46,9 @@ require (
4746
github.com/gorilla/mux v1.8.1 // indirect
4847
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4948
github.com/json-iterator/go v1.1.12 // indirect
50-
github.com/klauspost/compress v1.18.0 // indirect
49+
github.com/klauspost/compress v1.18.1 // indirect
5150
github.com/klauspost/pgzip v1.2.6 // indirect
5251
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
53-
github.com/moby/docker-image-spec v1.3.1 // indirect
5452
github.com/moby/sys/capability v0.4.0 // indirect
5553
github.com/moby/sys/mountinfo v0.7.2 // indirect
5654
github.com/moby/sys/user v0.4.0 // indirect
@@ -61,25 +59,25 @@ require (
6159
github.com/opencontainers/go-digest v1.0.0 // indirect
6260
github.com/opencontainers/runtime-spec v1.2.1 // indirect
6361
github.com/opencontainers/selinux v1.12.0 // indirect
64-
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
6562
github.com/pkg/errors v0.9.1 // indirect
6663
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
6764
github.com/sirupsen/logrus v1.9.3 // indirect
6865
github.com/sylabs/sif/v2 v2.21.1 // indirect
69-
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
66+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
7067
github.com/ulikunitz/xz v0.5.12 // indirect
71-
github.com/vbatts/tar-split v0.12.1 // indirect
68+
github.com/vbatts/tar-split v0.12.2 // indirect
7269
go.opencensus.io v0.24.0 // indirect
73-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
74-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
75-
go.opentelemetry.io/otel v1.37.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
77-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
78-
golang.org/x/mod v0.24.0 // indirect
79-
golang.org/x/sync v0.13.0 // indirect
80-
golang.org/x/sys v0.33.0 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
82-
google.golang.org/grpc v1.71.0 // indirect
83-
google.golang.org/protobuf v1.36.6 // indirect
70+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
72+
go.opentelemetry.io/otel v1.38.0 // indirect
73+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
75+
golang.org/x/mod v0.29.0 // indirect
76+
golang.org/x/sync v0.17.0 // indirect
77+
golang.org/x/sys v0.38.0 // indirect
78+
google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba // indirect
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
80+
google.golang.org/grpc v1.76.0 // indirect
81+
google.golang.org/protobuf v1.36.10 // indirect
8482
gopkg.in/yaml.v3 v3.0.1 // indirect
8583
)

0 commit comments

Comments
 (0)