Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated version,GO and CSI spec #1153

Merged
merged 4 commits into from
May 6, 2024
Merged

Updated version,GO and CSI spec #1153

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8781f2
Updated version,GO and CSI spec
hemalathagajendran May 3, 2024
2a6e2b2
modified image link to quay dev
hemalathagajendran May 3, 2024
e99bf12
Modified go version in travis yaml
hemalathagajendran May 3, 2024
36aa29c
Merge branch 'dev' into CSI2.12_Curreny
Jainbrt May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services: docker
dist: focal
language: go
go:
- 1.20.x
- 1.22.x

env:
global:
Expand Down
4 changes: 2 additions & 2 deletions ...ble/ibm-spectrum-scale-csi-operator-bundle/case/ibm-spectrum-scale-csi-operator/case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ibm-spectrum-scale-csi-operator
specVersion: 1.0.0
version: 2.11.0
appVersion: 2.11.0
version: 2.12.0
appVersion: 2.12.0
description: "Represents a deployment of the IBM CSI Storage Scale driver."
displayName: "IBM CSI Storage Scale Driver CASE"
displayDescription: "Represents a deployment of the IBM CSI Storage Scale driver."
Expand Down
8 changes: 4 additions & 4 deletions ...-bundle/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperator/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- metadata:
name: ibm_spectrum_scale_csi_driver
image: cp/spectrum/scale/csi/ibm-spectrum-scale-csi-driver
tag: v2.11.0
tag: v2.12.0
digest: sha256:57b4ee494ca48342d1ffaf22a166286202b0406b88316e4dcbe87212df6ca8f0
mediaType: application/vnd.docker.distribution.manifest.list.v2
registries:
Expand All @@ -20,19 +20,19 @@ resources:
platform:
architecture: amd64
os: linux
tag: v2.11.0-amd64
tag: v2.12.0-amd64
- digest: sha256:4bcdd8eccc13908d8b6c9c21b4ffed63177c53b410d7d50a2bd036ff8398ef46
mediaType: application/vnd.docker.distribution.manifest.v2
platform:
architecture: ppc64le
os: linux
tag: v2.11.0-ppc64le
tag: v2.12.0-ppc64le
- digest: sha256:17d0601ca92224d38abc78a6a5771827ef130a49379270e536b3ca26cc9fc89f
mediaType: application/vnd.docker.distribution.manifest.v2
platform:
architecture: s390x
os: linux
tag: v2.11.0-s390x
tag: v2.12.0-s390x

- metadata:
name: csi_snapshotter
Expand Down
8 changes: 4 additions & 4 deletions ...le/case/ibm-spectrum-scale-csi-operator/inventory/ibmCSIScaleOperatorSetup/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
- metadata:
name: ibm_spectrum_scale_csi_operator
image: cpopen/ibm-spectrum-scale-csi-operator
tag: v2.11.0
tag: v2.12.0
digest: sha256:e3d2f9fb68b2d7cd1faf84002bb73626da10bed5d81f91945a592d41893e2fda
mediaType: application/vnd.docker.distribution.manifest.list.v2
registries:
Expand All @@ -20,19 +20,19 @@ resources:
platform:
architecture: amd64
os: linux
tag: v2.11.0-amd64
tag: v2.12.0-amd64
- digest: sha256:4d2ddb810b219aa0caf3e581d1c811dea6deefc1c491f09ff3d68b33b7875434
mediaType: application/vnd.docker.distribution.manifest.v2
platform:
architecture: ppc64le
os: linux
tag: v2.11.0-ppc64le
tag: v2.12.0-ppc64le
- digest: sha256:e299883ecd8932ca2b245246f91f7111c35de1dd0469f0daae2c7e71ee9ea7a1
mediaType: application/vnd.docker.distribution.manifest.v2
platform:
architecture: s390x
os: linux
tag: v2.11.0-s390x
tag: v2.12.0-s390x
files:
- mediaType: application/vnd.case.resource.k8s.v1+yaml
ref: cluster/deploy/crds/csi_v1_csiscaleoperator.yaml
Expand Down
4 changes: 2 additions & 2 deletions driver/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Multi-arch build for IBM Storage Scale CSI Driver
# usage: docker buildx build -f build/multi-arch.Dockerfile --platform=linux/amd64 -t my_image_tag .

FROM --platform=$BUILDPLATFORM golang:1.20 AS builder
FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
WORKDIR /go/src/github.com/IBM/ibm-spectrum-scale-csi/driver/
COPY ./go.mod .
COPY ./go.sum .
Expand All @@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "-X 'ma
# RUN chmod +x,u+s _output/ibm-spectrum-scale-csi

FROM registry.access.redhat.com/ubi9-minimal:latest
ARG version=2.11.0
ARG version=2.12.0
ARG commit
ARG build_date

Expand Down
2 changes: 1 addition & 1 deletion driver/cmd/ibm-spectrum-scale-csi/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var (
driverName = flag.String("drivername", "spectrumscale.csi.ibm.com", "name of the driver")
nodeID = flag.String("nodeid", "", "node id")
kubeletRootDir = flag.String("kubeletRootDirPath", "/var/lib/kubelet", "kubelet root directory path")
vendorVersion = "2.11.0"
vendorVersion = "2.12.0"
)

func main() {
Expand Down
5 changes: 5 additions & 0 deletions driver/csiplugin/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,6 +2884,11 @@ func (cs *ScaleControllerServer) ListSnapshots(ctx context.Context, req *csi.Lis
func (cs *ScaleControllerServer) GetCapacity(ctx context.Context, req *csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *ScaleControllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
Jainbrt marked this conversation as resolved.
Show resolved Hide resolved
}

func (cs *ScaleControllerServer) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
Expand Down
20 changes: 10 additions & 10 deletions driver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module github.com/IBM/ibm-spectrum-scale-csi/driver

go 1.20
go 1.22

require (
github.com/container-storage-interface/spec v1.5.0
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.1
github.com/container-storage-interface/spec v1.9.0
github.com/golang/protobuf v1.5.4
github.com/google/uuid v1.6.0
github.com/natefinch/lumberjack v2.0.0+incompatible
golang.org/x/net v0.17.0
golang.org/x/sys v0.13.0
google.golang.org/grpc v1.59.0
golang.org/x/net v0.24.0
golang.org/x/sys v0.19.0
google.golang.org/grpc v1.63.2
k8s.io/api v0.26.10
k8s.io/klog/v2 v2.90.1
k8s.io/mount-utils v0.26.10
Expand All @@ -24,9 +24,9 @@ require (
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
google.golang.org/protobuf v1.34.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
18 changes: 18 additions & 0 deletions driver/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/container-storage-interface/spec v1.5.0 h1:lvKxe3uLgqQeVQcrnL2CPQKISoKjTJxojEs9cBk+HXo=
github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -23,6 +25,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we not cleanup the older one from this file ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed this could be addressed in different PR as "go mod tidy" doesn't work after 1.20. Options should be explored.

github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
Expand All @@ -31,6 +35,8 @@ github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down Expand Up @@ -74,6 +80,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -87,10 +95,14 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Expand All @@ -109,15 +121,21 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
Expand Down
4 changes: 2 additions & 2 deletions generated/installer/ibm-spectrum-scale-csi-operator-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
product: ibm-spectrum-scale-csi
release: ibm-spectrum-scale-csi-operator
annotations:
productVersion: 2.11.0
productVersion: 2.12.0
spec:
replicas: 1
selector:
Expand All @@ -28,7 +28,7 @@ spec:
annotations:
productID: ibm-spectrum-scale-csi-operator
productName: IBM Spectrum Scale CSI Operator
productVersion: 2.11.0
productVersion: 2.12.0
spec:
serviceAccountName: ibm-spectrum-scale-csi-operator
containers:
Expand Down
8 changes: 4 additions & 4 deletions generated/installer/ibm-spectrum-scale-csi-operator-ocp-rhel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
product: ibm-spectrum-scale-csi
release: ibm-spectrum-scale-csi-operator
annotations:
productVersion: 2.11.0
productVersion: 2.12.0
spec:
replicas: 1
selector:
Expand All @@ -28,12 +28,12 @@ spec:
annotations:
productID: ibm-spectrum-scale-csi-operator
productName: IBM Spectrum Scale CSI Operator
productVersion: 2.11.0
productVersion: 2.12.0
spec:
serviceAccountName: ibm-spectrum-scale-csi-operator
containers:
- name: operator
image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
args:
- --leaderElection=true
env:
Expand All @@ -44,7 +44,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CSI_DRIVER_IMAGE
value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
resources:
limits:
cpu: 600m
Expand Down
8 changes: 4 additions & 4 deletions generated/installer/ibm-spectrum-scale-csi-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
product: ibm-spectrum-scale-csi
release: ibm-spectrum-scale-csi-operator
annotations:
productVersion: 2.11.0
productVersion: 2.12.0
spec:
replicas: 1
selector:
Expand All @@ -28,12 +28,12 @@ spec:
annotations:
productID: ibm-spectrum-scale-csi-operator
productName: IBM Spectrum Scale CSI Operator
productVersion: 2.11.0
productVersion: 2.12.0
spec:
serviceAccountName: ibm-spectrum-scale-csi-operator
containers:
- name: operator
image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
args:
- --leaderElection=true
env:
Expand All @@ -44,7 +44,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CSI_DRIVER_IMAGE
value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
resources:
limits:
cpu: 600m
Expand Down
2 changes: 1 addition & 1 deletion operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 2.11.0
VERSION ?= 2.12.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
Expand Down
4 changes: 2 additions & 2 deletions operator/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker build for IBM Storage Scale CSI Operator
FROM --platform=$BUILDPLATFORM golang:1.20 as builder
FROM --platform=$BUILDPLATFORM golang:1.22 as builder

ARG TARGETOS
ARG TARGETARCH
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN CGO_ENABLED=0 go build -ldflags="-X 'main.gitCommit=${REVISION}'" -a -o mana
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
WORKDIR /
ARG version=2.11.0
ARG version=2.12.0
ARG commit
ARG build_date

Expand Down
2 changes: 1 addition & 1 deletion operator/config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resources:
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonAnnotations:
productVersion: 2.11.0
productVersion: 2.12.0
2 changes: 1 addition & 1 deletion operator/config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
annotations:
productID: ibm-spectrum-scale-csi-operator
productName: IBM Spectrum Scale CSI Operator
productVersion: 2.11.0
productVersion: 2.12.0
labels:
app.kubernetes.io/instance: ibm-spectrum-scale-csi-operator
app.kubernetes.io/managed-by: ibm-spectrum-scale-csi-operator
Expand Down
4 changes: 2 additions & 2 deletions operator/config/overlays/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ patches:
spec:
containers:
- name: operator
image: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
image: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-operator@sha256:bd264199ac10d574163bfa32bb88844fd786ee6f794a56e235591d2f051c7807
env:
- name: METRICS_BIND_ADDRESS
- name: WATCH_NAMESPACE
- name: CSI_DRIVER_IMAGE
value: quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
value: quay.io/ibm-spectrum-scale-dev/ibm-spectrum-scale-csi-driver@sha256:b2bc343eadbc11d9ed74a8477d2cd0a7a8460a72203d3f6236d4662e68df1166
6 changes: 3 additions & 3 deletions operator/controllers/config/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const (
ENVKubeVersion = "KUBE_VERSION"
ENVCGPrefix = "CSI_CG_PREFIX"
ENVSymDirPath = "SYMLINK_DIR_PATH"
DriverVersion = "2.11.0"
OperatorVersion = "2.11.0"
DriverVersion = "2.12.0"
OperatorVersion = "2.12.0"

// Number of replica pods for CSI Sidecar deployment
ReplicaCount = int32(2)
Expand All @@ -89,7 +89,7 @@ const (

// Default images for containers

CSIDriverPluginImage = "quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver:v2.11.0"
CSIDriverPluginImage = "quay.io/ibm-spectrum-scale/ibm-spectrum-scale-csi-driver:v2.12.0"
// registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
CSINodeDriverRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar@sha256:c53535af8a7f7e3164609838c4b191b42b2d81238d75c1b2a2b582ada62a9780" // #nosec G101 false positive
// registry.k8s.io/sig-storage/livenessprobe:v2.12.0
Expand Down
2 changes: 1 addition & 1 deletion operator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/IBM/ibm-spectrum-scale-csi/operator

go 1.20
go 1.22

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we upgrade google.golang.org/protobuf and golang.org/x/net to latest available version too ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed this could be addressed in different PR as "go mod tidy" doesn't work after 1.20. Options should be explored.

require (
github.com/IBM/ibm-spectrum-scale-csi/driver v0.0.0-20240315055708-58ba59104fbf
Expand Down
Loading