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

Merge branch 'master' into rolling-update-pod-annotation

This commit is contained in:
Felix Kunde 2021-02-12 09:59:35 +01:00
parent 1974cfc48d 4d2b51de41
commit 329ef995cb
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/logical-backup/Dockerfile
View File

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

15
pkg/cluster/k8sres.go
View File

@ -320,16 +320,13 @@ func getLocalAndBoostrapPostgreSQLParameters(parameters map[string]string) (loca
} }
func generateCapabilities(capabilities []string) v1.Capabilities { func generateCapabilities(capabilities []string) v1.Capabilities {
if len(capabilities) > 0 { additionalCapabilities := make([]v1.Capability, 0, len(capabilities))
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))) }
} return v1.Capabilities{
return v1.Capabilities{ Add: additionalCapabilities,
Add: additionalCapabilities,
}
} }
return v1.Capabilities{}
} }
func nodeAffinity(nodeReadinessLabel map[string]string, nodeAffinity *v1.NodeAffinity) *v1.Affinity { func nodeAffinity(nodeReadinessLabel map[string]string, nodeAffinity *v1.NodeAffinity) *v1.Affinity {

4
pkg/cluster/k8sres_test.go
View File

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