From aa7f07314f7ff7e0935e90b9e42797856271477e Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Tue, 19 Nov 2019 17:41:55 +0100
Subject: [PATCH] some formatting in dump.sh and undo RBAC change

---
 docker/logical-backup/dump.sh                | 10 +++++-----
 manifests/operator-service-account-rbac.yaml |  6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/docker/logical-backup/dump.sh b/docker/logical-backup/dump.sh
index cf1e2d1f9..ee64bd811 100755
--- a/docker/logical-backup/dump.sh
+++ b/docker/logical-backup/dump.sh
@@ -14,7 +14,7 @@ PG_BIN=$PG_DIR/$PG_VERSION/bin
 DUMP_SIZE_COEFF=5
 
 TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-K8S_API_URL=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT
+K8S_API_URL=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT/api/v1
 CERT=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
 
 function estimate_size {
@@ -48,14 +48,14 @@ function aws_upload {
 function get_pods {
     declare -r SELECTOR="$1"
 
-    curl "${K8S_API_URL}/api/v1/namespaces/${POD_NAMESPACE}/pods?$SELECTOR"        \
-        --cacert $CERT                          \
+    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}/api/v1/namespaces/${POD_NAMESPACE}/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/manifests/operator-service-account-rbac.yaml b/manifests/operator-service-account-rbac.yaml
index 9be8c7ab9..e95fe320b 100644
--- a/manifests/operator-service-account-rbac.yaml
+++ b/manifests/operator-service-account-rbac.yaml
@@ -103,12 +103,6 @@ rules:
   - delete
   - get
   - patch
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - get
 - apiGroups:
   - apps
   resources: