Skip to content

Commit fa728fa

Browse files
ybettanybettan
committed
Bumping to go@1.22 and rhel-9.5.
Also bumping the api and client dependencies. Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
1 parent ab60f3c commit fa728fa

2,682 files changed

Lines changed: 161347 additions & 76265 deletions

File tree

Some content is hidden

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

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- if: matrix.language == 'go'
4444
uses: actions/setup-go@v4
4545
with:
46-
go-version: '1.21'
46+
go-version: '1.22'
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder
33

44
# Copy the Go Modules manifests
55
COPY go.mod go.mod
@@ -27,7 +27,7 @@ ARG TARGET
2727
RUN git config --global --add safe.directory ${PWD}
2828
RUN make ${TARGET}
2929

30-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
30+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
3131

3232
ARG TARGET
3333

‎Dockerfile.must-gather‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM quay.io/openshift/origin-cli:4.18 as builder
22

3-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
3+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
44

55
RUN microdnf update -y \
66
&& microdnf install -y tar rsync findutils gzip iproute util-linux shadow-utils \

‎Dockerfile.signimage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 as ksource
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 as ksource
22

33
# install the package that will contain the sign utilities
44
RUN microdnf update -y && \
55
microdnf install -y kernel-devel && \
66
microdnf clean all
77

8-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
8+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
99

1010
COPY --from=ksource /usr/src/kernels/*/scripts/sign-file /usr/local/bin/
1111

‎Dockerfile.webhook‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder
33

44
# Copy the Go Modules manifests
55
COPY go.mod go.mod
@@ -25,7 +25,7 @@ COPY .git .git
2525
RUN git config --global --add safe.directory ${PWD}
2626
RUN make webhook-server
2727

28-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
28+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
2929

3030
COPY --from=builder /opt/app-root/src/webhook-server /usr/local/bin/webhook-server
3131

‎Dockerfile.worker‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.21 as builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5 as builder
33

44
# Add the vendored dependencies
55
COPY vendor vendor
@@ -24,7 +24,7 @@ COPY .git .git
2424
RUN git config --global --add safe.directory ${PWD}
2525
RUN ["make", "worker"]
2626

27-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
27+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
2828

2929
RUN microdnf update -y && \
3030
microdnf install -y kmod shadow-utils && \

‎go.mod‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,60 @@
11
module github.com/rh-ecosystem-edge/kernel-module-management
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.22.2
5+
toolchain go1.22.3
66

77
require (
88
github.com/a8m/envsubst v1.4.2
99
github.com/budougumi0617/cmpmock v0.0.4
1010
github.com/containers/image/v5 v5.31.0
11-
github.com/docker/docker v27.1.2+incompatible
1211
github.com/go-logr/logr v1.4.2
1312
github.com/google/go-cmp v0.6.0
1413
github.com/google/go-containerregistry v0.19.1
1514
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20230523181351-c3f8a49229d3
1615
github.com/mitchellh/hashstructure/v2 v2.0.2
17-
github.com/moby/moby v27.0.0+incompatible
1816
github.com/onsi/ginkgo/v2 v2.19.0
1917
github.com/onsi/gomega v1.33.1
2018
github.com/openshift/api v0.0.0-20240514123321-944467d2cc3b
2119
github.com/otiai10/copy v1.14.0
2220
github.com/prometheus/client_golang v1.19.1
23-
github.com/spf13/cobra v1.8.0
21+
github.com/spf13/cobra v1.8.1
2422
go.uber.org/mock v0.4.0
2523
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
2624
golang.org/x/text v0.16.0
2725
gopkg.in/yaml.v3 v3.0.1
28-
k8s.io/api v0.29.3
29-
k8s.io/apimachinery v0.29.3
30-
k8s.io/client-go v0.29.3
31-
k8s.io/klog/v2 v2.120.1
26+
k8s.io/api v0.31.1
27+
k8s.io/apimachinery v0.31.1
28+
k8s.io/client-go v0.31.1
29+
k8s.io/klog/v2 v2.130.1
3230
k8s.io/kubectl v0.29.3
33-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
31+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3432
open-cluster-management.io/api v0.13.0
35-
sigs.k8s.io/controller-runtime v0.17.3
33+
sigs.k8s.io/controller-runtime v0.19.2
3634
sigs.k8s.io/yaml v1.4.0
3735
)
3836

3937
require (
4038
github.com/BurntSushi/toml v1.3.2 // indirect
41-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
39+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
40+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4241
github.com/beorn7/perks v1.0.1 // indirect
4342
github.com/blang/semver/v4 v4.0.0 // indirect
44-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
45-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
46-
github.com/containerd/containerd v1.7.11 // indirect
47-
github.com/containerd/log v0.1.0 // indirect
43+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
44+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4845
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
4946
github.com/containers/storage v1.54.0 // indirect
5047
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5148
github.com/docker/cli v26.1.3+incompatible // indirect
5249
github.com/docker/distribution v2.8.3+incompatible // indirect
50+
github.com/docker/docker v27.1.2+incompatible // indirect
5351
github.com/docker/docker-credential-helpers v0.8.1 // indirect
5452
github.com/docker/go-units v0.5.0 // indirect
5553
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
56-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
57-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
54+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5855
github.com/felixge/httpsnoop v1.0.4 // indirect
5956
github.com/fsnotify/fsnotify v1.7.0 // indirect
57+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6058
github.com/go-logr/stdr v1.2.2 // indirect
6159
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6260
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -66,22 +64,20 @@ require (
6664
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6765
github.com/golang/mock v1.6.0 // indirect
6866
github.com/golang/protobuf v1.5.4 // indirect
69-
github.com/google/cel-go v0.17.7 // indirect
67+
github.com/google/cel-go v0.20.1 // indirect
7068
github.com/google/gnostic-models v0.6.8 // indirect
7169
github.com/google/gofuzz v1.2.0 // indirect
72-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
70+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
7371
github.com/google/uuid v1.6.0 // indirect
74-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7573
github.com/imdario/mergo v0.3.13 // indirect
7674
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7775
github.com/josharian/intern v1.0.0 // indirect
7876
github.com/json-iterator/go v1.1.12 // indirect
7977
github.com/klauspost/compress v1.17.8 // indirect
8078
github.com/mailru/easyjson v0.7.7 // indirect
8179
github.com/mitchellh/go-homedir v1.1.0 // indirect
82-
github.com/moby/patternmatcher v0.6.0 // indirect
8380
github.com/moby/sys/mountinfo v0.7.1 // indirect
84-
github.com/moby/sys/sequential v0.5.0 // indirect
8581
github.com/moby/sys/user v0.1.0 // indirect
8682
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8783
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -90,41 +86,43 @@ require (
9086
github.com/opencontainers/image-spec v1.1.0 // indirect
9187
github.com/opencontainers/runtime-spec v1.2.0 // indirect
9288
github.com/pkg/errors v0.9.1 // indirect
93-
github.com/prometheus/client_model v0.6.0 // indirect
94-
github.com/prometheus/common v0.51.1 // indirect
95-
github.com/prometheus/procfs v0.12.0 // indirect
89+
github.com/prometheus/client_model v0.6.1 // indirect
90+
github.com/prometheus/common v0.55.0 // indirect
91+
github.com/prometheus/procfs v0.15.1 // indirect
9692
github.com/sirupsen/logrus v1.9.3 // indirect
9793
github.com/spf13/pflag v1.0.5 // indirect
9894
github.com/stoewer/go-strcase v1.2.0 // indirect
9995
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
10096
github.com/vbatts/tar-split v0.11.5 // indirect
101-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
102-
go.opentelemetry.io/otel v1.24.0 // indirect
103-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
105-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
106-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
107-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
108-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
109-
golang.org/x/net v0.25.0 // indirect
110-
golang.org/x/oauth2 v0.20.0 // indirect
97+
github.com/x448/float16 v0.8.4 // indirect
98+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
99+
go.opentelemetry.io/otel v1.28.0 // indirect
100+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
101+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
102+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
103+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
104+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
105+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
106+
golang.org/x/net v0.26.0 // indirect
107+
golang.org/x/oauth2 v0.21.0 // indirect
111108
golang.org/x/sync v0.7.0 // indirect
112-
golang.org/x/sys v0.20.0 // indirect
113-
golang.org/x/term v0.20.0 // indirect
109+
golang.org/x/sys v0.21.0 // indirect
110+
golang.org/x/term v0.21.0 // indirect
114111
golang.org/x/time v0.3.0 // indirect
115112
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
116113
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
117-
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
118-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
119-
google.golang.org/grpc v1.62.1 // indirect
120-
google.golang.org/protobuf v1.33.0 // indirect
114+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
115+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
116+
google.golang.org/grpc v1.65.0 // indirect
117+
google.golang.org/protobuf v1.34.2 // indirect
118+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
121119
gopkg.in/inf.v0 v0.9.1 // indirect
122120
gopkg.in/yaml.v2 v2.4.0 // indirect
123-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
124-
k8s.io/apiserver v0.29.2 // indirect
125-
k8s.io/component-base v0.29.3 // indirect
126-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
127-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
121+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
122+
k8s.io/apiserver v0.31.0 // indirect
123+
k8s.io/component-base v0.31.0 // indirect
124+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
125+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
128126
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
129127
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
130128
)

0 commit comments

Comments
 (0)