From 0cce565b651000639f6758444c12b3397e68c2cf Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 29 Jan 2021 16:10:27 +0100 Subject: [PATCH] fix when adding only one capability (#1339) * fix when adding only one capability * fix error messages in unit test --- pkg/cluster/k8sres.go | 2 +- pkg/cluster/k8sres_test.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 56500bb29..b1a8adb0b 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -321,7 +321,7 @@ func getLocalAndBoostrapPostgreSQLParameters(parameters map[string]string) (loca } func generateCapabilities(capabilities []string) v1.Capabilities { - if len(capabilities) > 1 { + if len(capabilities) > 0 { additionalCapabilities := []v1.Capability{} for _, capability := range capabilities { additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability))) diff --git a/pkg/cluster/k8sres_test.go b/pkg/cluster/k8sres_test.go index 6034db214..efed071d7 100644 --- a/pkg/cluster/k8sres_test.go +++ b/pkg/cluster/k8sres_test.go @@ -1511,13 +1511,21 @@ func TestGenerateCapabilities(t *testing.T) { capabilities: v1.Capabilities{}, err: fmt.Errorf("could not parse empty capabilities configuration"), }, + { + subTest: "configured capability", + configured: []string{"SYS_NICE"}, + capabilities: v1.Capabilities{ + Add: []v1.Capability{"SYS_NICE"}, + }, + err: fmt.Errorf("could not generate one configured capability"), + }, { subTest: "configured capabilities", configured: []string{"SYS_NICE", "CHOWN"}, capabilities: v1.Capabilities{ Add: []v1.Capability{"SYS_NICE", "CHOWN"}, }, - err: fmt.Errorf("could not parse empty capabilities configuration"), + err: fmt.Errorf("could not generate multiple configured capabilities"), }, } for _, tt := range tests {