Merge pull request kubernetes#95543 from wawa0210/fix-95530

Remove the dependency of csi-translation-lib module on apiserver/cloud-provider/controller-manager

Author: k8s-ci-robot

staging/publishing/rules.yaml

@@ -1094,16 +1094,6 @@ rules:
       branch: master
     - repository: apimachinery
       branch: master
-    - repository: apiserver
-      branch: master
-    - repository: client-go
-      branch: master
-    - repository: cloud-provider
-      branch: master
-    - repository: component-base
-      branch: master
-    - repository: controller-manager
-      branch: master
   - source:
       branch: release-1.17
       dir: staging/src/k8s.io/csi-translation-lib

staging/src/k8s.io/csi-translation-lib/go.mod

@@ -8,17 +8,11 @@ require (
 	github.com/stretchr/testify v1.4.0
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
-	k8s.io/cloud-provider v0.0.0
 	k8s.io/klog/v2 v2.2.0
 )
 
 replace (
 	k8s.io/api => ../api
 	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/cloud-provider => ../cloud-provider
-	k8s.io/component-base => ../component-base
-	k8s.io/controller-manager => ../controller-manager
 	k8s.io/csi-translation-lib => ../csi-translation-lib
 )

staging/src/k8s.io/csi-translation-lib/go.sum

@@ -6,6 +6,7 @@ go_library(
         "aws_ebs.go",
         "azure_disk.go",
         "azure_file.go",
+        "const.go",
         "gce_pd.go",
         "in_tree_volume.go",
         "openstack_cinder.go",
@@ -19,7 +20,6 @@ go_library(
         "//staging/src/k8s.io/api/storage/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//staging/src/k8s.io/cloud-provider/volume:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
     ],
 )

staging/src/k8s.io/csi-translation-lib/plugins/BUILD

@@ -0,0 +1,21 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package plugins
+
+// Matches the delimiter LabelMultiZoneDelimiter used by k8s.io/cloud-provider/volume and is mirrored here to avoid a large dependency
+// labelMultiZoneDelimiter separates zones for volumes
+const labelMultiZoneDelimiter = "__"

staging/src/k8s.io/csi-translation-lib/plugins/const.go

@@ -25,7 +25,6 @@ import (
 	storage "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	cloudvolume "k8s.io/cloud-provider/volume"
 )
 
 const (
@@ -217,7 +216,7 @@ func (g *gcePersistentDiskCSITranslator) TranslateInTreePVToCSI(pv *v1.Persisten
 	}
 
 	zonesLabel := pv.Labels[v1.LabelZoneFailureDomain]
-	zones := strings.Split(zonesLabel, cloudvolume.LabelMultiZoneDelimiter)
+	zones := strings.Split(zonesLabel, labelMultiZoneDelimiter)
 	if len(zones) == 1 && len(zones[0]) != 0 {
 		// Zonal
 		volID = fmt.Sprintf(volIDZonalFmt, UnspecifiedValue, zones[0], pv.Spec.GCEPersistentDisk.PDName)

staging/src/k8s.io/csi-translation-lib/plugins/gce_pd.go

@@ -24,7 +24,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	cloudvolume "k8s.io/cloud-provider/volume"
 )
 
 // InTreePlugin handles translations between CSI and in-tree sources in a PV
@@ -157,7 +156,7 @@ func translateTopology(pv *v1.PersistentVolume, topologyKey string) error {
 	}
 
 	if label, ok := pv.Labels[v1.LabelZoneFailureDomain]; ok {
-		zones = strings.Split(label, cloudvolume.LabelMultiZoneDelimiter)
+		zones = strings.Split(label, labelMultiZoneDelimiter)
 		if len(zones) > 0 {
 			return addTopology(pv, topologyKey, zones)
 		}