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

K8s and OCP version update #230

Merged
merged 4 commits into from
Sep 17, 2024
Merged

K8s and OCP version update #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1964cc
Update k8s version
WilsonRadadia20 Sep 16, 2024
d23703e
Update OCP version
WilsonRadadia20 Sep 16, 2024
62795f9
Fix for G115: integer overflow conversion int64 -> uint64 (gosec)
WilsonRadadia20 Sep 17, 2024
c5f2339
Fix for the G115: integer overflow conversion int64 -> uint64 (gosec)…
WilsonRadadia20 Sep 17, 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
4 changes: 2 additions & 2 deletions dell-csi-helm-installer/verify-csi-unity.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

# verify-csi-unity method
function verify-csi-unity() {
verify_k8s_versions "1.24" "1.30"
verify_openshift_versions "4.15" "4.16"
verify_k8s_versions "1.25" "1.31"
verify_openshift_versions "4.16" "4.17"
verify_namespace "${NS}"
verify_required_secrets "${RELEASE}-creds"
verify_optional_secrets "${RELEASE}-certs"
Expand Down
8 changes: 4 additions & 4 deletions service/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func (s *service) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest

log.Debug("Filesystem does not exist, proceeding to create new filesystem")
// Hardcoded ProtocolNFS to 0 in order to support only NFS
resp, err := fileAPI.CreateFilesystem(ctx, volName, storagePool, desc, nasServer, uint64(size), int(tieringPolicy), int(hostIoSize), ProtocolNFS, thin, dataReduction)
resp, err := fileAPI.CreateFilesystem(ctx, volName, storagePool, desc, nasServer, uint64(size), int(tieringPolicy), int(hostIoSize), ProtocolNFS, thin, dataReduction) // #nosec G115 - This is a false positive
// Add method to create filesystem
if err != nil {
log.Debugf("Filesystem create response:%v Error:%v", resp, err)
Expand Down Expand Up @@ -261,7 +261,7 @@ func (s *service) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest
}

log.Debug("Volume does not exist, proceeding to create new volume")
resp, err := volumeAPI.CreateLun(ctx, volName, storagePool, desc, uint64(size), int(tieringPolicy), hostIOLimitID, thin, dataReduction)
resp, err := volumeAPI.CreateLun(ctx, volName, storagePool, desc, uint64(size), int(tieringPolicy), hostIOLimitID, thin, dataReduction) // #nosec G115 - This is a false positive
if err != nil {
return nil, status.Error(codes.Unknown, utils.GetMessageWithRunID(rid, "Create Volume %s failed with error: %v", volName, err))
}
Expand Down Expand Up @@ -831,13 +831,13 @@ func (s *service) ControllerExpandVolume(ctx context.Context, req *csi.Controlle
}

// Idempotency check
if filesystem.FileContent.SizeTotal >= uint64(capacity) {
if filesystem.FileContent.SizeTotal >= uint64(capacity) /* #nosec G115 -- This is a false positive */ {
log.Infof("New Filesystem size (%d) is lower or same as existing Filesystem size. Ignoring expand volume operation.", filesystem.FileContent.SizeTotal)
expandVolumeResp.NodeExpansionRequired = false
return expandVolumeResp, nil
}

err = filesystemAPI.ExpandFilesystem(ctx, volID, uint64(capacity))
err = filesystemAPI.ExpandFilesystem(ctx, volID, uint64(capacity)) // #nosec G115 - This is a false positive
if err != nil {
return nil, status.Error(codes.Unknown, utils.GetMessageWithRunID(rid, "Expand filesystem failed with error: %v", err))
}
Expand Down