query namespaced K8s API in logical backup script (zalando#623)

FxKu · web-flow · commit 2c3c7fd244e0 · 2019-07-18T14:00:30.000+02:00
diff --git a/docker/logical-backup/dump.sh b/docker/logical-backup/dump.sh
@@ -48,14 +48,14 @@ function aws_upload {
 function get_pods {
     declare -r SELECTOR="$1"
 
-    curl "${K8S_API_URL}/pods?$SELECTOR"        \
+    curl "${K8S_API_URL}/namespaces/${POD_NAMESPACE}/pods?$SELECTOR"        \
         --cacert $CERT                          \
         -H "Authorization: Bearer ${TOKEN}" | jq .items[].status.podIP -r
 }
 
 function get_current_pod {
-    curl "${K8S_API_URL}/pods?fieldSelector=metadata.name%3D${HOSTNAME}" \
-        --cacert $CERT                                                   \
+    curl "${K8S_API_URL}/namespaces/${POD_NAMESPACE}/pods?fieldSelector=metadata.name%3D${HOSTNAME}" \
+        --cacert $CERT   \
         -H "Authorization: Bearer ${TOKEN}"
 }
 
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
@@ -1528,6 +1528,15 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
 			Name:  "SCOPE",
 			Value: c.Name,
 		},
+		{
+			Name: "POD_NAMESPACE",
+			ValueFrom: &v1.EnvVarSource{
+				FieldRef: &v1.ObjectFieldSelector{
+					APIVersion: "v1",
+					FieldPath:  "metadata.namespace",
+				},
+			},
+		},
 		// Bucket env vars
 		{
 			Name:  "LOGICAL_BACKUP_S3_BUCKET",
