public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix when adding only one capability (#1339) 

* fix when adding only one capability

* fix error messages in unit test
This commit is contained in:
Felix Kunde 2021-01-29 16:10:27 +01:00 committed by GitHub
parent 12ad8c91fa
commit 0cce565b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/k8sres.go
View File

@ -321,7 +321,7 @@ func getLocalAndBoostrapPostgreSQLParameters(parameters map[string]string) (loca
} }
func generateCapabilities(capabilities []string) v1.Capabilities { func generateCapabilities(capabilities []string) v1.Capabilities {
if len(capabilities) > 1 { if len(capabilities) > 0 {
additionalCapabilities := []v1.Capability{} additionalCapabilities := []v1.Capability{}
for _, capability := range capabilities { for _, capability := range capabilities {
additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability))) additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability)))

10
pkg/cluster/k8sres_test.go
View File

@ -1511,13 +1511,21 @@ func TestGenerateCapabilities(t *testing.T) {
capabilities: v1.Capabilities{}, capabilities: v1.Capabilities{},
err: fmt.Errorf("could not parse empty capabilities configuration"), 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", subTest: "configured capabilities",
configured: []string{"SYS_NICE", "CHOWN"}, configured: []string{"SYS_NICE", "CHOWN"},
capabilities: v1.Capabilities{ capabilities: v1.Capabilities{
Add: []v1.Capability{"SYS_NICE", "CHOWN"}, 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 { for _, tt := range tests {