Merge branch 'master' into pgteammap-reference

docker/logical-backup/Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update     \
         gnupg \
         gcc \
         libffi-dev \
+    && pip3 install --upgrade pip \
     && pip3 install --no-cache-dir awscli --upgrade \
     && pip3 install --no-cache-dir gsutil --upgrade \
     && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \

pkg/cluster/k8sres.go

@@ -321,16 +321,13 @@ func getLocalAndBoostrapPostgreSQLParameters(parameters map[string]string) (loca
 }
 
 func generateCapabilities(capabilities []string) v1.Capabilities {
-	if len(capabilities) > 0 {
-		additionalCapabilities := []v1.Capability{}
-		for _, capability := range capabilities {
-			additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability)))
-		}
-		return v1.Capabilities{
-			Add: additionalCapabilities,
-		}
+	additionalCapabilities := make([]v1.Capability, 0, len(capabilities))
+	for _, capability := range capabilities {
+		additionalCapabilities = append(additionalCapabilities, v1.Capability(strings.ToUpper(capability)))
+	}
+	return v1.Capabilities{
+		Add: additionalCapabilities,
 	}
-	return v1.Capabilities{}
 }
 
 func nodeAffinity(nodeReadinessLabel map[string]string, nodeAffinity *v1.NodeAffinity) *v1.Affinity {

pkg/cluster/k8sres_test.go

@@ -1502,13 +1502,13 @@ func TestGenerateCapabilities(t *testing.T) {
 		{
 			subTest:      "no capabilities",
 			configured:   nil,
-			capabilities: v1.Capabilities{},
+			capabilities: v1.Capabilities{Add: []v1.Capability{}},
 			err:          fmt.Errorf("could not parse capabilities configuration of nil"),
 		},
 		{
 			subTest:      "empty capabilities",
 			configured:   []string{},
-			capabilities: v1.Capabilities{},
+			capabilities: v1.Capabilities{Add: []v1.Capability{}},
 			err:          fmt.Errorf("could not parse empty capabilities configuration"),
 		},
 		{