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 gh-pages

This commit is contained in:
Felix Kunde 2021-09-14 17:05:02 +02:00
parent 191e7878b3 c8dc7ca871
commit 611d265a6d
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
charts/postgres-operator/postgres-operator-1.7.0.tgz
View File

Binary file not shown.

8
charts/postgres-operator/templates/_helpers.tpl
View File

@ -57,18 +57,16 @@ Flatten nested config options when ConfigMap is used as ConfigTarget
*/}} */}}
{{- define "flattenValuesForConfigMap" }} {{- define "flattenValuesForConfigMap" }}
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{- if or (kindIs "string" $value) (kindIs "int" $value) }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if kindIs "slice" $value }} {{- if kindIs "slice" $value }}
{{ $key }}: {{ join "," $value | quote }} {{ $key }}: {{ join "," $value | quote }}
{{- end }} {{- else if kindIs "map" $value }}
{{- if kindIs "map" $value }}
{{- $list := list }} {{- $list := list }}
{{- range $subKey, $subValue := $value }} {{- range $subKey, $subValue := $value }}
{{- $list = append $list (printf "%s:%s" $subKey $subValue) }} {{- $list = append $list (printf "%s:%s" $subKey $subValue) }}
{{ $key }}: {{ join "," $list | quote }} {{ $key }}: {{ join "," $list | quote }}
{{- end }} {{- end }}
{{- else }}
{{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
manifests/complete-postgres-manifest.yaml
View File

@ -157,7 +157,7 @@ spec:
# - name: "telegraf-sidecar" # - name: "telegraf-sidecar"
# image: "telegraf:latest" # image: "telegraf:latest"
# ports: # ports:
# name: metrics # - name: metrics
# containerPort: 8094 # containerPort: 8094
# protocol: TCP # protocol: TCP
# resources: # resources:

2
pkg/util/httpclient/httpclient.go
View File

@ -1,6 +1,6 @@
package httpclient package httpclient
//go:generate mockgen -package mocks -destination=$PWD/mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor //go:generate mockgen -package mocks -destination=../../../mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
import "net/http" import "net/http"

2
pkg/util/volumes/volumes.go
View File

@ -1,6 +1,6 @@
package volumes package volumes
//go:generate mockgen -package mocks -destination=$PWD/mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor //go:generate mockgen -package mocks -destination=../../../mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
import v1 "k8s.io/api/core/v1" import v1 "k8s.io/api/core/v1"