Skip to content

Commit 2200abd

Browse files
Merge pull request #158 from IBM/bha-cve-fixes
CVE fixes
2 parents 769fa6d + 791e591 commit 2200abd

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179 as s3fs-builder
1+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179.1741863533 as s3fs-builder
22

33
ARG RHSM_PASS=blank
44
ARG RHSM_USER=blank
@@ -46,7 +46,7 @@ ENV GOARCH $ARCH
4646
ENV GO111MODULE=on
4747

4848
RUN git clone https://github.com/rclone/rclone.git && \
49-
cd rclone && git checkout tags/v1.68.2 && \
49+
cd rclone && git checkout tags/v1.69.0 && \
5050
go build && ./rclone version && \
5151
cp rclone /usr/local/bin/rclone
5252

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/prometheus/client_golang v1.21.1
1919
github.com/stretchr/testify v1.10.0
2020
go.uber.org/zap v1.27.0
21-
golang.org/x/net v0.37.0
21+
golang.org/x/net v0.38.0
2222
google.golang.org/grpc v1.65.0
2323
k8s.io/api v0.32.3
2424
k8s.io/apimachinery v0.32.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
342342
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
343343
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
344344
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
345-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
346-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
345+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
346+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
347347
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
348348
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
349349
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

pkg/constants/constants.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ package constants
22

33
const (
44
DefaultIAMEndPoint = "https://iam.cloud.ibm.com"
5-
DefaultVolumesPerNode = 4
5+
6+
// Maximum number of volumes that controller can publish to the node.
7+
// If value is not set or zero CO SHALL decide how many volumes of
8+
// this type can be published by the controller to the node. The
9+
// plugin MUST NOT set negative values here.
10+
DefaultVolumesPerNode = 0
611

712
KPEncryptionAlgorithm = "AES256" // https://github.com/IBM/ibm-cos-sdk-go/blob/master/service/s3/api.go#L9130-L9136
813

0 commit comments

Comments
 (0)