Skip to content

Commit 27a90d8

Browse files
jcantrilljcantrill
committed
LOG-8992: update dependencies to match OCP v4.22
1 parent 30295d6 commit 27a90d8

4 files changed

Lines changed: 216 additions & 193 deletions

File tree

‎Dockerfile‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
FROM golang:1.24 AS builder
1+
FROM golang:1.25 AS builder
22

3-
ENV REMOTE_SOURCES=${REMOTE_SOURCES:-.}
4-
ENV REMOTE_SOURCES_DIR=${REMOTE_SOURCES_DIR:-.}
5-
ENV APP_DIR=.
63
ENV CACHE_DEPS="true"
7-
WORKDIR /opt/apt-root/src
4+
WORKDIR /opt/app-root/src
85

96

10-
COPY ${APP_DIR}/api ./api
11-
COPY ${APP_DIR}/go.mod ${APP_DIR}/go.sum ./
7+
COPY ./api ./api
8+
COPY ./go.mod ./go.sum ./
129
RUN if [ -n $CACHE_DEPS ]; then go mod download ; fi
13-
COPY ${APP_DIR}/.bingo .bingo
14-
COPY ${APP_DIR}/Makefile ./Makefile
15-
COPY ${APP_DIR}/version ./version
16-
COPY ${APP_DIR}/cmd/main.go ./cmd/main.go
17-
COPY ${APP_DIR}/internal ./internal
10+
COPY ./.bingo .bingo
11+
COPY ./Makefile ./Makefile
12+
COPY ./version ./version
13+
COPY ./cmd/main.go ./cmd/main.go
14+
COPY ./internal ./internal
1815

1916
USER 0
2017
RUN make build
@@ -31,9 +28,6 @@ esac
3128

3229
FROM registry.access.redhat.com/ubi9/ubi-minimal
3330

34-
ENV APP_DIR=/opt/apt-root/src
35-
ENV SRC_DIR=./
36-
3731
RUN INSTALL_PKGS=" \
3832
openssl \
3933
rsync \
@@ -46,11 +40,11 @@ RUN INSTALL_PKGS=" \
4640
mkdir /tmp/ocp-clo && \
4741
chmod og+w /tmp/ocp-clo
4842

49-
COPY --from=builder $APP_DIR/bin/cluster-logging-operator /usr/bin/
43+
COPY --from=builder /opt/app-root/src/bin/cluster-logging-operator /usr/bin/
5044

5145
COPY --from=origincli /tmp/oc /usr/bin/oc
5246

53-
COPY $SRC_DIR/must-gather/collection-scripts/* /usr/bin/
47+
COPY ./must-gather/collection-scripts/* /usr/bin/
5448

5549
USER 1000
5650
WORKDIR /usr/bin

‎cmd/main.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import (
4646
oauth "github.com/openshift/api/oauth/v1"
4747
routev1 "github.com/openshift/api/route/v1"
4848
securityv1 "github.com/openshift/api/security/v1"
49-
elasticsearch "github.com/openshift/elasticsearch-operator/apis/logging/v1"
5049
hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
5150
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
5251
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
@@ -64,7 +63,6 @@ func init() {
6463
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
6564

6665
utilruntime.Must(apis.AddToScheme(scheme))
67-
utilruntime.Must(elasticsearch.AddToScheme(scheme))
6866
utilruntime.Must(routev1.AddToScheme(scheme))
6967
utilruntime.Must(consolev1.AddToScheme(scheme))
7068
utilruntime.Must(oauth.AddToScheme(scheme))

‎go.mod‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,52 @@
11
module github.com/openshift/cluster-logging-operator
22

3-
go 1.24
3+
go 1.25.0
44

55
require (
66
github.com/ViaQ/logerr/v2 v2.1.0
77
github.com/aws/aws-sdk-go-v2 v1.41.5
88
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.68.0
99
github.com/aws/aws-sdk-go-v2/service/s3 v1.98.0
10-
github.com/go-logr/logr v1.4.2
10+
github.com/go-logr/logr v1.4.3
1111
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
1212
github.com/google/go-cmp v0.7.0
13-
github.com/klauspost/compress v1.17.9
14-
github.com/onsi/ginkgo/v2 v2.23.4
15-
github.com/onsi/gomega v1.37.0
13+
github.com/klauspost/compress v1.18.0
14+
github.com/onsi/ginkgo/v2 v2.27.2
15+
github.com/onsi/gomega v1.38.2
1616
github.com/openshift/api v0.0.0-20250131155403-30a036067514
1717
github.com/openshift/cluster-logging-operator/api/observability v0.0.0-00010101000000-000000000000
18-
github.com/openshift/elasticsearch-operator v0.0.0-20220613183908-e1648e67c298
1918
github.com/openshift/hypershift/api v0.0.0-20250331115040-26fc3ceb1929
2019
github.com/pavel-v-chernykh/keystore-go/v4 v4.1.0
2120
github.com/pelletier/go-toml v1.9.5
2221
github.com/pkg/errors v0.9.1
2322
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.55.1
24-
github.com/prometheus/client_golang v1.20.5
25-
github.com/spf13/pflag v1.0.6
26-
github.com/stretchr/testify v1.10.0
23+
github.com/prometheus/client_golang v1.23.2
24+
github.com/spf13/pflag v1.0.9
25+
github.com/stretchr/testify v1.11.1
2726
github.com/vspaz/wls-go v0.0.0-20230405190232-47d1e477c82c
2827
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
29-
golang.org/x/net v0.37.0
30-
golang.org/x/sync v0.12.0
31-
golang.org/x/sys v0.32.0
28+
golang.org/x/net v0.47.0
29+
golang.org/x/sync v0.18.0
30+
golang.org/x/sys v0.38.0
3231
gonum.org/v1/plot v0.16.0
33-
k8s.io/api v0.32.2
34-
k8s.io/apimachinery v0.32.2
35-
k8s.io/apiserver v0.32.2
36-
k8s.io/client-go v0.32.2
37-
k8s.io/utils v0.0.0-20241210054802-24370beab758
32+
k8s.io/api v0.35.1
33+
k8s.io/apimachinery v0.35.1
34+
k8s.io/apiserver v0.35.1
35+
k8s.io/client-go v0.35.1
36+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3837
sigs.k8s.io/controller-runtime v0.19.6
39-
sigs.k8s.io/yaml v1.4.0
38+
sigs.k8s.io/yaml v1.6.0
4039
)
4140

4241
require (
43-
cel.dev/expr v0.18.0 // indirect
42+
cel.dev/expr v0.24.0 // indirect
4443
codeberg.org/go-fonts/liberation v0.5.0 // indirect
4544
codeberg.org/go-latex/latex v0.1.0 // indirect
4645
codeberg.org/go-pdf/fpdf v0.10.0 // indirect
4746
git.sr.ht/~sbinet/gg v0.6.0 // indirect
47+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4848
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
4949
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
50-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5150
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
5251
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
5352
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
@@ -63,11 +62,11 @@ require (
6362
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6463
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6564
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
66-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
65+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
6766
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6867
github.com/felixge/httpsnoop v1.0.4 // indirect
69-
github.com/fsnotify/fsnotify v1.8.0 // indirect
70-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
68+
github.com/fsnotify/fsnotify v1.9.0 // indirect
69+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7170
github.com/go-logr/stdr v1.2.2 // indirect
7271
github.com/go-logr/zapr v1.3.0 // indirect
7372
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -76,63 +75,65 @@ require (
7675
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7776
github.com/gogo/protobuf v1.3.2 // indirect
7877
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
79-
github.com/golang/protobuf v1.5.4 // indirect
80-
github.com/google/cel-go v0.22.0 // indirect
81-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
82-
github.com/google/gofuzz v1.2.0 // indirect
78+
github.com/google/cel-go v0.26.0 // indirect
79+
github.com/google/gnostic-models v0.7.0 // indirect
8380
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
8481
github.com/google/uuid v1.6.0 // indirect
85-
github.com/gorilla/websocket v1.5.0 // indirect
86-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
82+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
83+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
8784
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8885
github.com/josharian/intern v1.0.0 // indirect
8986
github.com/json-iterator/go v1.1.12 // indirect
9087
github.com/kylelemons/godebug v1.1.0 // indirect
9188
github.com/mailru/easyjson v0.7.7 // indirect
9289
github.com/moby/spdystream v0.5.0 // indirect
9390
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
94-
github.com/modern-go/reflect2 v1.0.2 // indirect
91+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
9592
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9693
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9794
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
98-
github.com/prometheus/client_model v0.6.1 // indirect
99-
github.com/prometheus/common v0.61.0 // indirect
100-
github.com/prometheus/procfs v0.15.1 // indirect
101-
github.com/spf13/cobra v1.8.1 // indirect
95+
github.com/prometheus/client_model v0.6.2 // indirect
96+
github.com/prometheus/common v0.66.1 // indirect
97+
github.com/prometheus/procfs v0.16.1 // indirect
98+
github.com/spf13/cobra v1.10.0 // indirect
10299
github.com/stoewer/go-strcase v1.3.0 // indirect
103100
github.com/x448/float16 v0.8.4 // indirect
104-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
105-
go.opentelemetry.io/otel v1.28.0 // indirect
106-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
107-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
108-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
109-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
110-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
111-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
112-
go.uber.org/automaxprocs v1.6.0 // indirect
101+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
102+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
103+
go.opentelemetry.io/otel v1.36.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
109+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
113110
go.uber.org/multierr v1.11.0 // indirect
114111
go.uber.org/zap v1.27.0 // indirect
112+
go.yaml.in/yaml/v2 v2.4.3 // indirect
113+
go.yaml.in/yaml/v3 v3.0.4 // indirect
115114
golang.org/x/image v0.25.0 // indirect
116-
golang.org/x/oauth2 v0.27.0 // indirect
117-
golang.org/x/term v0.30.0 // indirect
118-
golang.org/x/text v0.23.0 // indirect
115+
golang.org/x/mod v0.29.0 // indirect
116+
golang.org/x/oauth2 v0.30.0 // indirect
117+
golang.org/x/term v0.37.0 // indirect
118+
golang.org/x/text v0.31.0 // indirect
119119
golang.org/x/time v0.11.0 // indirect
120-
golang.org/x/tools v0.31.0 // indirect
120+
golang.org/x/tools v0.38.0 // indirect
121121
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
122-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
123-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
124-
google.golang.org/grpc v1.65.0 // indirect
125-
google.golang.org/protobuf v1.36.5 // indirect
126-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
122+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
123+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
124+
google.golang.org/grpc v1.72.2 // indirect
125+
google.golang.org/protobuf v1.36.8 // indirect
126+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
127127
gopkg.in/inf.v0 v0.9.1 // indirect
128128
gopkg.in/yaml.v3 v3.0.1 // indirect
129-
k8s.io/apiextensions-apiserver v0.32.2 // indirect
130-
k8s.io/component-base v0.32.2 // indirect
129+
k8s.io/apiextensions-apiserver v0.35.1 // indirect
130+
k8s.io/component-base v0.35.1 // indirect
131131
k8s.io/klog/v2 v2.130.1 // indirect
132-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
133-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
134-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
135-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
132+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
133+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
134+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
135+
sigs.k8s.io/randfill v1.0.0 // indirect
136+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
136137
)
137138

138139
replace github.com/openshift/cluster-logging-operator/api/observability => ./api/observability/

0 commit comments

Comments
 (0)