github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Pass unknown labels in allowedTopologies during CSI translation

Browse Source 
Change-Id: If90d6f4c4e6a5b5706fa255f058249b3c5a28e35
This commit is contained in:
Matthew Cary 2021-07-16 22:48:56 +00:00
parent 33aba7ee02
commit f0b34bd24a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/csi-translation-lib/plugins/in_tree_volume.go
View File

@ -306,7 +306,7 @@ func translateTopologyFromCSIToInTree(pv *v1.PersistentVolume, csiTopologyKey st
return nil return nil
} }
// translateAllowedTopologies translates allowed topologies within storage class // translateAllowedTopologies translates allowed topologies within storage class or PV
// from legacy failure domain to given CSI topology key // from legacy failure domain to given CSI topology key
func translateAllowedTopologies(terms []v1.TopologySelectorTerm, key string) ([]v1.TopologySelectorTerm, error) { func translateAllowedTopologies(terms []v1.TopologySelectorTerm, key string) ([]v1.TopologySelectorTerm, error) {
if terms == nil { if terms == nil {
@ -323,10 +323,9 @@ func translateAllowedTopologies(terms []v1.TopologySelectorTerm, key string) ([]
Key: key, Key: key,
Values: exp.Values, Values: exp.Values,
} }
} else if exp.Key == key {
newExp = exp
} else { } else {
return nil, fmt.Errorf("unknown topology key: %v", exp.Key) // Other topologies are passed through unchanged.
newExp = exp
} }
newTerm.MatchLabelExpressions = append(newTerm.MatchLabelExpressions, newExp) newTerm.MatchLabelExpressions = append(newTerm.MatchLabelExpressions, newExp)
} }

19
staging/src/k8s.io/csi-translation-lib/plugins/in_tree_volume_test.go
View File

@ -582,7 +582,6 @@ func TestTranslateAllowedTopologies(t *testing.T) {
name string name string
topology []v1.TopologySelectorTerm topology []v1.TopologySelectorTerm
expectedToplogy []v1.TopologySelectorTerm expectedToplogy []v1.TopologySelectorTerm
expErr bool
}{ }{
{ {
name: "no translation", name: "no translation",
@ -664,18 +663,24 @@ func TestTranslateAllowedTopologies(t *testing.T) {
}, },
}, },
}, },
expErr: true, expectedToplogy: []v1.TopologySelectorTerm{
{
MatchLabelExpressions: []v1.TopologySelectorLabelRequirement{
{
Key: "test",
Values: []string{"foo", "bar"},
},
},
},
},
}, },
} }
for _, tc := range testCases { for _, tc := range testCases {
t.Logf("Running test: %v", tc.name) t.Logf("Running test: %v", tc.name)
gotTop, err := translateAllowedTopologies(tc.topology, GCEPDTopologyKey) gotTop, err := translateAllowedTopologies(tc.topology, GCEPDTopologyKey)
if err != nil && !tc.expErr { if err != nil {
t.Errorf("Did not expect an error, got: %v", err) t.Errorf("Unexpected error: %w", err)
}
if err == nil && tc.expErr {
t.Errorf("Expected an error but did not get one")
} }
if !reflect.DeepEqual(gotTop, tc.expectedToplogy) { if !reflect.DeepEqual(gotTop, tc.expectedToplogy) {