OCPBUGS-20124: FastFix: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.25 into release-4.12

README.md

@@ -27,10 +27,10 @@ Refer to [Getting Started Guide](/docs/developers-guide.md/) for setting up deve
 Please join us on [Kubernetes provider-openstack slack channel](https://kubernetes.slack.com/messages/provider-openstack)
 
 Project Co-Leads:
-* @lxkong - Lingxian Kong
-* @ramineni - Anusha Ramineni
-* @chrigl - Christoph Glaubitz
+* @dulek - Michał Dulko
 * @jichenjc - Chen Ji
+* @kayrus
+* @zetaab - Jesse Haka
 
 ## License
 

pkg/csi/cinder/controllerserver.go

@@ -281,6 +281,7 @@ func (cs *controllerServer) ControllerUnpublishVolume(ctx context.Context, req *
 }
 
 func (cs *controllerServer) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
+	klog.V(4).Infof("ListVolumes: called with %+#v request", req)
 
 	if req.MaxEntries < 0 {
 		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf(
@@ -297,7 +298,7 @@ func (cs *controllerServer) ListVolumes(ctx context.Context, req *csi.ListVolume
 		return nil, status.Error(codes.Internal, fmt.Sprintf("ListVolumes failed with error %v", err))
 	}
 
-	var ventries []*csi.ListVolumesResponse_Entry
+	ventries := make([]*csi.ListVolumesResponse_Entry, 0, len(vlist))
 	for _, v := range vlist {
 		ventry := csi.ListVolumesResponse_Entry{
 			Volume: &csi.Volume{
@@ -307,13 +308,16 @@ func (cs *controllerServer) ListVolumes(ctx context.Context, req *csi.ListVolume
 		}
 
 		status := &csi.ListVolumesResponse_VolumeStatus{}
+		status.PublishedNodeIds = make([]string, 0, len(v.Attachments))
 		for _, attachment := range v.Attachments {
 			status.PublishedNodeIds = append(status.PublishedNodeIds, attachment.ServerID)
 		}
 		ventry.Status = status
 
 		ventries = append(ventries, &ventry)
 	}
+
+	klog.V(4).Infof("ListVolumes: completed with %d entries and %q next token", len(ventries), nextPageToken)
 	return &csi.ListVolumesResponse{
 		Entries:   ventries,
 		NextToken: nextPageToken,
@@ -479,7 +483,7 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap
 		return nil, status.Errorf(codes.Internal, "ListSnapshots failed with error %v", err)
 	}
 
-	var sentries []*csi.ListSnapshotsResponse_Entry
+	sentries := make([]*csi.ListSnapshotsResponse_Entry, 0, len(slist))
 	for _, v := range slist {
 		ctime := timestamppb.New(v.CreatedAt)
 		if err := ctime.CheckValid(); err != nil {
@@ -583,6 +587,7 @@ func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.Co
 	}
 
 	status := &csi.ControllerGetVolumeResponse_VolumeStatus{}
+	status.PublishedNodeIds = make([]string, 0, len(volume.Attachments))
 	for _, attachment := range volume.Attachments {
 		status.PublishedNodeIds = append(status.PublishedNodeIds, attachment.ServerID)
 	}

pkg/csi/cinder/controllerserver_test.go

@@ -441,7 +441,9 @@ func TestListVolumes(t *testing.T) {
 					VolumeId:      FakeVol3.ID,
 					CapacityBytes: int64(FakeVol3.Size * 1024 * 1024 * 1024),
 				},
-				Status: &csi.ListVolumesResponse_VolumeStatus{},
+				Status: &csi.ListVolumesResponse_VolumeStatus{
+					PublishedNodeIds: []string{},
+				},
 			},
 		},
 		NextToken: "",

pkg/csi/cinder/openstack/openstack_snapshots.go

@@ -117,11 +117,11 @@ func (os *OpenStack) ListSnapshots(filters map[string]string) ([]snapshots.Snaps
 		}
 
 		if nextPageURL != "" {
-			queryParams, err := url.ParseQuery(nextPageURL)
+			pageURL, err := url.Parse(nextPageURL)
 			if err != nil {
 				return false, err
 			}
-			nextPageToken = queryParams.Get("marker")
+			nextPageToken = pageURL.Query().Get("marker")
 		}
 
 		return false, nil

pkg/csi/cinder/openstack/openstack_volumes.go

@@ -93,11 +93,11 @@ func (os *OpenStack) ListVolumes(limit int, startingToken string) ([]volumes.Vol
 		}
 
 		if nextPageURL != "" {
-			queryParams, err := url.ParseQuery(nextPageURL)
+			pageURL, err := url.Parse(nextPageURL)
 			if err != nil {
 				return false, err
 			}
-			nextPageToken = queryParams.Get("marker")
+			nextPageToken = pageURL.Query().Get("marker")
 		}
 
 		return false, nil

tests/playbooks/roles/install-docker/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-docker_version: 5:19.03.15~3-0~ubuntu-focal
+docker_version: 5:20.10.18~3-0~ubuntu-focal

tests/playbooks/roles/install-docker/tasks/main.yml

@@ -28,7 +28,7 @@
 # apt-get update; apt install -y docker-ce=<version>
 - name: Install docker-ce
   apt:
-    name: docker-ce={{ docker_version }}
+    name: docker-ce #={{ docker_version }}
     state: present
     update_cache: yes