From e5bc33e52fc7934b5562ad1d031fba87971dbeb6 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Wed, 17 Jul 2019 16:25:46 +0200
Subject: [PATCH] query namespaced K8s API in logical backup script
---
docker/logical-backup/dump.sh | 6 +++---
pkg/cluster/k8sres.go | 9 +++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/docker/logical-backup/dump.sh b/docker/logical-backup/dump.sh
index fea3161e..dcbd7d33 100755
--- 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
index 54b123a1..b1342ce4 100644
--- 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",
--
GitLab