Skip to content

Commit 2fa2a04

Browse files
Utkarshjhalloydsa
Utkarshjh
and
alloydsa
authored
3rd-party packages upgrade for 25.02
Co-authored-by: alloydsa <[email protected]>
1 parent cc2f7f7 commit 2fa2a04

File tree

5 files changed

+238
-269
lines changed

5 files changed

+238
-269
lines changed

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ RUN --mount=type=secret,id=activation_key,env=ACTIVATION_KEY \
1111
--mount=type=secret,id=organization,env=ORGANIZATION \
1212
function unregister() { subscription-manager unregister || true; }; trap unregister EXIT; \
1313
if [[ $DEPS_IMAGE =~ "alpine" ]]; \
14-
then apk add nfs-utils; \
15-
else subscription-manager register --activationkey $ACTIVATION_KEY --org $ORGANIZATION && \
16-
yum install --repo=rhel-9-*-baseos-rpms -y nfs-utils; \
14+
then apk add nfs-utils; \
15+
else subscription-manager register --activationkey $ACTIVATION_KEY --org $ORGANIZATION && \
16+
yum install --repo=rhel-9-*-baseos-rpms -y nfs-utils; \
1717
fi
1818

1919
# Get the mount.nfs4 dependency
@@ -23,8 +23,8 @@ RUN ldd /sbin/mount.nfs | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c
2323
FROM scratch
2424

2525
LABEL maintainers="The NetApp Trident Team" \
26-
app="trident.netapp.io" \
27-
description="Trident Storage Orchestrator"
26+
app="trident.netapp.io" \
27+
description="Trident Storage Orchestrator"
2828

2929
COPY --from=deps /bin/mount /bin/umount /bin/
3030
COPY --from=deps /sbin/mount.nfs /sbin/mount.nfs4 /sbin/

‎cli/k8s_client/yaml_factory.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ spec:
633633
- name: asup-dir
634634
mountPath: /asup
635635
- name: csi-provisioner
636-
image: {CSI_SIDECAR_REGISTRY}/csi-provisioner:v5.1.0
636+
image: {CSI_SIDECAR_REGISTRY}/csi-provisioner:v5.2.0
637637
imagePullPolicy: {IMAGE_PULL_POLICY}
638638
securityContext:
639639
capabilities:
@@ -653,7 +653,7 @@ spec:
653653
- name: socket-dir
654654
mountPath: /var/lib/csi/sockets/pluginproxy/
655655
- name: csi-attacher
656-
image: {CSI_SIDECAR_REGISTRY}/csi-attacher:v4.7.0
656+
image: {CSI_SIDECAR_REGISTRY}/csi-attacher:v4.8.0
657657
imagePullPolicy: {IMAGE_PULL_POLICY}
658658
securityContext:
659659
capabilities:
@@ -672,7 +672,7 @@ spec:
672672
- name: socket-dir
673673
mountPath: /var/lib/csi/sockets/pluginproxy/
674674
- name: csi-resizer
675-
image: {CSI_SIDECAR_REGISTRY}/csi-resizer:v1.12.0
675+
image: {CSI_SIDECAR_REGISTRY}/csi-resizer:v1.13.1
676676
imagePullPolicy: {IMAGE_PULL_POLICY}
677677
args:
678678
- "--v={SIDECAR_LOG_LEVEL}"
@@ -686,7 +686,7 @@ spec:
686686
- name: socket-dir
687687
mountPath: /var/lib/csi/sockets/pluginproxy/
688688
- name: csi-snapshotter
689-
image: {CSI_SIDECAR_REGISTRY}/csi-snapshotter:v8.1.0
689+
image: {CSI_SIDECAR_REGISTRY}/csi-snapshotter:v8.2.0
690690
imagePullPolicy: {IMAGE_PULL_POLICY}
691691
securityContext:
692692
capabilities:
@@ -1069,7 +1069,7 @@ spec:
10691069
mountPath: /certs
10701070
readOnly: true
10711071
- name: driver-registrar
1072-
image: {CSI_SIDECAR_REGISTRY}/csi-node-driver-registrar:v2.12.0
1072+
image: {CSI_SIDECAR_REGISTRY}/csi-node-driver-registrar:v2.13.0
10731073
imagePullPolicy: {IMAGE_PULL_POLICY}
10741074
args:
10751075
- "--v={SIDECAR_LOG_LEVEL}"

‎config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ const (
150150
UnixPathSeparator = "/"
151151

152152
// Minimum and maximum supported Kubernetes versions
153-
KubernetesVersionMin = "v1.25"
154-
KubernetesVersionMax = "v1.31"
153+
KubernetesVersionMin = "v1.26"
154+
KubernetesVersionMax = "v1.32"
155155

156156
// KubernetesCSISidecarRegistry is where the CSI sidecar images are hosted
157157
KubernetesCSISidecarRegistry = "registry.k8s.io/sig-storage"

‎go.mod‎

Lines changed: 70 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ module github.com/netapp/trident
33
go 1.23.0
44

55
require (
6-
cloud.google.com/go/compute v1.28.1
7-
cloud.google.com/go/netapp v1.4.0 // https://pkg.go.dev/cloud.google.com/go/netapp
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
9-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/netapp/armnetapp/v7 v7.2.0
6+
cloud.google.com/go/compute v1.33.0
7+
cloud.google.com/go/netapp v1.6.0 // https://pkg.go.dev/cloud.google.com/go/netapp
8+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
9+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/netapp/armnetapp/v7 v7.3.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armfeatures v1.2.0
12-
github.com/RoaringBitmap/roaring/v2 v2.3.5
13-
github.com/aws/aws-sdk-go-v2 v1.32.2
14-
github.com/aws/aws-sdk-go-v2/config v1.27.43
15-
github.com/aws/aws-sdk-go-v2/credentials v1.17.41
16-
github.com/aws/aws-sdk-go-v2/service/fsx v1.49.2
17-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2
12+
github.com/RoaringBitmap/roaring/v2 v2.4.2
13+
github.com/aws/aws-sdk-go-v2 v1.34.0
14+
github.com/aws/aws-sdk-go-v2/config v1.29.2
15+
github.com/aws/aws-sdk-go-v2/credentials v1.17.55
16+
github.com/aws/aws-sdk-go-v2/service/fsx v1.51.6
17+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.14
1818
github.com/cenkalti/backoff/v4 v4.3.0
1919
github.com/container-storage-interface/spec v1.9.0
2020
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
2121
github.com/dustin/go-humanize v1.0.2-0.20231009183035-961771c7ab99
22-
github.com/elastic/go-sysinfo v1.14.2
22+
github.com/elastic/go-sysinfo v1.15.0
2323
github.com/evanphx/json-patch/v5 v5.9.0
2424
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // 1/18/2022
2525
github.com/go-openapi/errors v0.22.0
@@ -36,45 +36,45 @@ require (
3636
github.com/kr/secureheader v0.2.0
3737
github.com/kubernetes-csi/csi-lib-utils v0.16.0
3838
github.com/kubernetes-csi/csi-proxy/client v1.1.3
39-
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
39+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
4040
github.com/mattermost/xml-roundtrip-validator v0.1.1-0.20230502164821-3079e7b80fca
4141
github.com/mitchellh/copystructure v1.2.0
4242
github.com/mitchellh/hashstructure/v2 v2.0.2
4343
github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77
44-
github.com/openshift/api v0.0.0-20241009131553-a1523024209f
44+
github.com/openshift/api v0.0.0-20250124212313-a770960d61e0
4545
github.com/prometheus/client_golang v1.20.4
4646
github.com/sirupsen/logrus v1.9.3
47-
github.com/spf13/afero v1.11.0
47+
github.com/spf13/afero v1.12.0
4848
github.com/spf13/cobra v1.8.1
49-
github.com/stretchr/testify v1.9.0
49+
github.com/stretchr/testify v1.10.0
5050
github.com/vishvananda/netlink v1.3.0
51-
github.com/zcalusic/sysinfo v1.1.2
52-
go.uber.org/mock v0.4.0
51+
github.com/zcalusic/sysinfo v1.1.3
52+
go.uber.org/mock v0.5.0
5353
go.uber.org/multierr v1.11.0 // github.com/uber-go/multierr
54-
golang.org/x/crypto v0.28.0 // github.com/golang/crypto
55-
golang.org/x/net v0.30.0 // github.com/golang/net
56-
golang.org/x/oauth2 v0.23.0 // github.com/golang/oauth2
54+
golang.org/x/crypto v0.32.0 // github.com/golang/crypto
55+
golang.org/x/net v0.34.0 // github.com/golang/net
56+
golang.org/x/oauth2 v0.26.0 // github.com/golang/oauth2
5757
golang.org/x/sys v0.29.0 // github.com/golang/sys
58-
golang.org/x/text v0.19.0 // github.com/golang/text
59-
golang.org/x/time v0.7.0 // github.com/golang/time
60-
google.golang.org/api v0.200.0
61-
google.golang.org/grpc v1.67.1 // github.com/grpc/grpc-go
62-
google.golang.org/protobuf v1.35.1 // github.com/protocolbuffers/protobuf-go
63-
k8s.io/api v0.31.1 // github.com/kubernetes/api
64-
k8s.io/apiextensions-apiserver v0.31.1 // github.com/kubernetes/apiextensions-apiserver
65-
k8s.io/apimachinery v0.31.1 // github.com/kubernetes/apimachinery
66-
k8s.io/client-go v0.31.1 // github.com/kubernetes/client-go
67-
k8s.io/mount-utils v0.31.1 // github.com/kubernetes/mount-utils
68-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // github.com/kubernetes/utils
58+
golang.org/x/text v0.21.0 // github.com/golang/text
59+
golang.org/x/time v0.9.0 // github.com/golang/time
60+
google.golang.org/api v0.218.0
61+
google.golang.org/grpc v1.70.0 // github.com/grpc/grpc-go
62+
google.golang.org/protobuf v1.36.4 // github.com/protocolbuffers/protobuf-go
63+
k8s.io/api v0.32.1 // github.com/kubernetes/api
64+
k8s.io/apiextensions-apiserver v0.32.1 // github.com/kubernetes/apiextensions-apiserver
65+
k8s.io/apimachinery v0.32.1 // github.com/kubernetes/apimachinery
66+
k8s.io/client-go v0.32.1 // github.com/kubernetes/client-go
67+
k8s.io/mount-utils v0.32.1 // github.com/kubernetes/mount-utils
68+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // github.com/kubernetes/utils
6969
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.50 // github.com/kubernetes-sigs/cloud-provider-azure
7070
)
7171

7272
require (
73-
cloud.google.com/go v0.115.1 // indirect
74-
cloud.google.com/go/auth v0.9.8 // indirect
75-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
76-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
77-
cloud.google.com/go/longrunning v0.6.1 // indirect
73+
cloud.google.com/go v0.118.1 // indirect
74+
cloud.google.com/go/auth v0.14.0 // indirect
75+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
76+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
77+
cloud.google.com/go/longrunning v0.6.4 // indirect
7878
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
7979
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
8080
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0 // indirect
@@ -91,24 +91,23 @@ require (
9191
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
9292
github.com/Microsoft/go-winio v0.6.0 // indirect
9393
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
94-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
97-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
102-
github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
103-
github.com/aws/smithy-go v1.22.0 // indirect
94+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.25 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 // indirect
97+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.12 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.11 // indirect
102+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.10 // indirect
103+
github.com/aws/smithy-go v1.22.2 // indirect
104104
github.com/beorn7/perks v1.0.1 // indirect
105-
github.com/bits-and-blooms/bitset v1.12.0 // indirect
105+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
106106
github.com/cespare/xxhash/v2 v2.3.0 // indirect
107107
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
108-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
109108
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
110109
github.com/docker/go-connections v0.4.0 // indirect
111-
github.com/elastic/go-windows v1.0.0 // indirect
110+
github.com/elastic/go-windows v1.0.2 // indirect
112111
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
113112
github.com/felixge/httpsnoop v1.0.4 // indirect
114113
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -120,17 +119,14 @@ require (
120119
github.com/go-openapi/jsonreference v0.21.0 // indirect
121120
github.com/go-openapi/loads v0.22.0 // indirect
122121
github.com/go-openapi/spec v0.21.0 // indirect
123-
github.com/godbus/dbus/v5 v5.1.0 // indirect
124122
github.com/gogo/protobuf v1.3.2 // indirect
125123
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
126-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
127124
github.com/google/gnostic-models v0.6.8 // indirect
128125
github.com/google/gofuzz v1.2.0 // indirect
129-
github.com/google/s2a-go v0.1.8 // indirect
126+
github.com/google/s2a-go v0.1.9 // indirect
130127
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
131-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
128+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
132129
github.com/gorilla/websocket v1.5.0 // indirect
133-
github.com/imdario/mergo v0.3.12 // indirect
134130
github.com/inconshreveable/mousetrap v1.1.0 // indirect
135131
github.com/josharian/intern v1.0.0 // indirect
136132
github.com/json-iterator/go v1.1.12 // indirect
@@ -140,16 +136,15 @@ require (
140136
github.com/mattn/go-runewidth v0.0.10 // indirect
141137
github.com/mitchellh/mapstructure v1.5.0 // indirect
142138
github.com/mitchellh/reflectwalk v1.0.2 // indirect
143-
github.com/moby/spdystream v0.4.0 // indirect
144-
github.com/moby/sys/mountinfo v0.7.1 // indirect
139+
github.com/moby/spdystream v0.5.0 // indirect
140+
github.com/moby/sys/mountinfo v0.7.2 // indirect
141+
github.com/moby/sys/userns v0.1.0 // indirect
145142
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
146143
github.com/modern-go/reflect2 v1.0.2 // indirect
147144
github.com/mschoch/smat v0.2.0 // indirect
148145
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
149146
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
150147
github.com/oklog/ulid v1.3.1 // indirect
151-
github.com/opencontainers/runc v1.1.13 // indirect
152-
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
153148
github.com/opentracing/opentracing-go v1.2.0 // indirect
154149
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
155150
github.com/pkg/errors v0.9.1 // indirect
@@ -163,28 +158,28 @@ require (
163158
github.com/vishvananda/netns v0.0.5 // indirect
164159
github.com/x448/float16 v0.8.4 // indirect
165160
go.mongodb.org/mongo-driver v1.14.0 // indirect
166-
go.opencensus.io v0.24.0 // indirect
167-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
168-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
169-
go.opentelemetry.io/otel v1.29.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
171-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
172-
golang.org/x/mod v0.20.0 // indirect
173-
golang.org/x/sync v0.8.0 // indirect
174-
golang.org/x/term v0.25.0 // indirect
175-
golang.org/x/tools v0.24.0 // indirect
176-
google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect
177-
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
161+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
162+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
163+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
164+
go.opentelemetry.io/otel v1.34.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
166+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
167+
golang.org/x/mod v0.21.0 // indirect
168+
golang.org/x/sync v0.10.0 // indirect
169+
golang.org/x/term v0.28.0 // indirect
170+
golang.org/x/tools v0.26.0 // indirect
171+
google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4 // indirect
172+
google.golang.org/genproto/googleapis/api v0.0.0-20250124145028-65684f501c47 // indirect
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect
179174
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
180175
gopkg.in/inf.v0 v0.9.1 // indirect
181176
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
182177
gopkg.in/yaml.v2 v2.4.0 // indirect
183178
gopkg.in/yaml.v3 v3.0.1 // indirect
184-
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
179+
howett.net/plist v1.0.1 // indirect
185180
k8s.io/klog/v2 v2.130.1 // indirect
186-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
187-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
188-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
181+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
182+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
183+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
189184
sigs.k8s.io/yaml v1.4.0 // indirect
190185
)

0 commit comments

Comments
 (0)