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 cron-pod-affinity

This commit is contained in:
Felix Kunde 2019-07-18 14:46:42 +02:00
parent d294d7057e 2c3c7fd244
commit 2e4578e56f
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/logical-backup/dump.sh
View File

@ -48,14 +48,14 @@ function aws_upload {
function get_pods { function get_pods {
declare -r SELECTOR="$1" declare -r SELECTOR="$1"
curl "${K8S_API_URL}/pods?$SELECTOR" \ curl "${K8S_API_URL}/namespaces/${POD_NAMESPACE}/pods?$SELECTOR" \
--cacert $CERT \ --cacert $CERT \
-H "Authorization: Bearer ${TOKEN}" | jq .items[].status.podIP -r -H "Authorization: Bearer ${TOKEN}" | jq .items[].status.podIP -r
} }
function get_current_pod { function get_current_pod {
curl "${K8S_API_URL}/pods?fieldSelector=metadata.name%3D${HOSTNAME}" \ curl "${K8S_API_URL}/namespaces/${POD_NAMESPACE}/pods?fieldSelector=metadata.name%3D${HOSTNAME}" \
--cacert $CERT \ --cacert $CERT \
-H "Authorization: Bearer ${TOKEN}" -H "Authorization: Bearer ${TOKEN}"
} }

10
docs/quickstart.md
View File

@ -54,9 +54,13 @@ kubectl create -f manifests/operator-service-account-rbac.yaml # identity and p
kubectl create -f manifests/postgres-operator.yaml # deployment kubectl create -f manifests/postgres-operator.yaml # deployment
``` ```
When using kubectl 1.14 or newer the mentioned manifests could be also be There is a [Kustomization](https://github.com/kubernetes-sigs/kustomize)
bundled in one [Kustomization](https://github.com/kubernetes-sigs/kustomize) manifest that [combines the mentioned resources](../manifests/kustomization.yaml) -
manifest. it can be used with kubectl 1.14 or newer as easy as:
```bash
kubectl apply -k github.com/zalando/postgres-operator/manifests
```
For convenience, we have automated starting the operator with minikube using the For convenience, we have automated starting the operator with minikube using the
`run_operator_locally` script. It applies the [`acid-minimal-cluster`](../manifests/minimal-postgres-manifest). `run_operator_locally` script. It applies the [`acid-minimal-cluster`](../manifests/minimal-postgres-manifest).

2
docs/reference/operator_parameters.md
View File

@ -277,7 +277,7 @@ configuration they are grouped under the `kubernetes` key.
the same topology , e.g. node. The default is `false`. the same topology , e.g. node. The default is `false`.
* **pod_antiaffinity_topology_key** * **pod_antiaffinity_topology_key**
override [topology key](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#interlude-built-in-node-labels) override [topology key](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#built-in-node-labels)
for pod anti affinity. The default is `kubernetes.io/hostname`. for pod anti affinity. The default is `kubernetes.io/hostname`.
* **pod_management_policy** * **pod_management_policy**

6
manifests/kustomization.yaml Normal file
View File

@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- configmap.yaml
- operator-service-account-rbac.yaml
- postgres-operator.yaml

9
pkg/cluster/k8sres.go
View File

@ -1528,6 +1528,15 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
Name: "SCOPE", Name: "SCOPE",
Value: c.Name, Value: c.Name,
}, },
{
Name: "POD_NAMESPACE",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{
APIVersion: "v1",
FieldPath: "metadata.namespace",
},
},
},
// Bucket env vars // Bucket env vars
{ {
Name: "LOGICAL_BACKUP_S3_BUCKET", Name: "LOGICAL_BACKUP_S3_BUCKET",