Skip to content

Commit 0cce565

Browse files
authored
fix when adding only one capability (zalando#1339)
* fix when adding only one capability * fix error messages in unit test
1 parent 12ad8c9 commit 0cce565

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pkg/cluster/k8sres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func getLocalAndBoostrapPostgreSQLParameters(parameters map[string]string) (loca
321321
}
322322

323323
func generateCapabilities(capabilities []string) v1.Capabilities {
324-
if len(capabilities) > 1 {
324+
if len(capabilities) > 0 {
325325
additionalCapabilities := []v1.Capability{}
326326
for _, capability := range capabilities {
327327
additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability)))

pkg/cluster/k8sres_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,13 +1511,21 @@ func TestGenerateCapabilities(t *testing.T) {
15111511
capabilities: v1.Capabilities{},
15121512
err: fmt.Errorf("could not parse empty capabilities configuration"),
15131513
},
1514+
{
1515+
subTest: "configured capability",
1516+
configured: []string{"SYS_NICE"},
1517+
capabilities: v1.Capabilities{
1518+
Add: []v1.Capability{"SYS_NICE"},
1519+
},
1520+
err: fmt.Errorf("could not generate one configured capability"),
1521+
},
15141522
{
15151523
subTest: "configured capabilities",
15161524
configured: []string{"SYS_NICE", "CHOWN"},
15171525
capabilities: v1.Capabilities{
15181526
Add: []v1.Capability{"SYS_NICE", "CHOWN"},
15191527
},
1520-
err: fmt.Errorf("could not parse empty capabilities configuration"),
1528+
err: fmt.Errorf("could not generate multiple configured capabilities"),
15211529
},
15221530
}
15231531
for _, tt := range tests {

0 commit comments

Comments
 (0)