From 608aeabfda07a8857b39b1d21fc89a24957196cd Mon Sep 17 00:00:00 2001
From: "David B. Tucker" <dbtucker@google.com>
Date: Fri, 5 Apr 2019 18:05:36 -0400
Subject: [PATCH 1/5] Parameterize sidecar image name for Kubernetes scripts.

---
 kube/README.md      | 1 +
 kube/full/deploy.sh | 3 ++-
 kube/patch.sh       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kube/README.md b/kube/README.md
index 94a53e78..2e134972 100644
--- a/kube/README.md
+++ b/kube/README.md
@@ -8,6 +8,7 @@ Required environment variables:
 * `KUBE_CLUSTER`: cluster name parameter for the sidecar
 * `GCP_REGION`: GCP region parameter for the sidecar
 * `GCP_PROJECT`: GCP project parameter for the sidecar
+* `SIDECAR_IMAGE_NAME`: Image name parameter for the sidecar
 * `SIDECAR_IMAGE_TAG`: Version parameter for the sidecar
 
 If your cluster is not the default context:
diff --git a/kube/full/deploy.sh b/kube/full/deploy.sh
index 22042034..6553c195 100755
--- a/kube/full/deploy.sh
+++ b/kube/full/deploy.sh
@@ -5,7 +5,8 @@ set -u
 
 pushd "$(dirname "$0")"
 
-# Override to use a different Docker image version for the sidecar.
+# Override to use a different Docker image name or version for the sidecar.
+export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar'}
 export SIDECAR_IMAGE_TAG=${SIDECAR_IMAGE_TAG:-'master'}
 export KUBE_NAMESPACE=${KUBE_NAMESPACE:-'default'}
 
diff --git a/kube/patch.sh b/kube/patch.sh
index 7c459e25..944a6fe8 100755
--- a/kube/patch.sh
+++ b/kube/patch.sh
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: sidecar
-        image: gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar:${SIDECAR_IMAGE_TAG}
+        image: ${SIDECAR_IMAGE_NAME}:${SIDECAR_IMAGE_TAG}
         imagePullPolicy: Always
         args:
         - \"--stackdriver.project-id=${GCP_PROJECT}\"

From 5ae33bbd01c9a75e2eeeabac6de0f5a6382ba44a Mon Sep 17 00:00:00 2001
From: "David B. Tucker" <dbtucker@google.com>
Date: Fri, 5 Apr 2019 18:22:19 -0400
Subject: [PATCH 2/5] Move env var to patch.sh to preserve backwards
 compatibility.

---
 kube/README.md      | 5 ++++-
 kube/full/deploy.sh | 3 +--
 kube/patch.sh       | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kube/README.md b/kube/README.md
index 2e134972..9047f3ad 100644
--- a/kube/README.md
+++ b/kube/README.md
@@ -8,9 +8,12 @@ Required environment variables:
 * `KUBE_CLUSTER`: cluster name parameter for the sidecar
 * `GCP_REGION`: GCP region parameter for the sidecar
 * `GCP_PROJECT`: GCP project parameter for the sidecar
-* `SIDECAR_IMAGE_NAME`: Image name parameter for the sidecar
 * `SIDECAR_IMAGE_TAG`: Version parameter for the sidecar
 
+Optional environment variables:
+* `SIDECAR_IMAGE_NAME`: Image name parameter for the sidecar (default:
+  gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar)
+
 If your cluster is not the default context:
 
 ```sh
diff --git a/kube/full/deploy.sh b/kube/full/deploy.sh
index 6553c195..22042034 100755
--- a/kube/full/deploy.sh
+++ b/kube/full/deploy.sh
@@ -5,8 +5,7 @@ set -u
 
 pushd "$(dirname "$0")"
 
-# Override to use a different Docker image name or version for the sidecar.
-export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar'}
+# Override to use a different Docker image version for the sidecar.
 export SIDECAR_IMAGE_TAG=${SIDECAR_IMAGE_TAG:-'master'}
 export KUBE_NAMESPACE=${KUBE_NAMESPACE:-'default'}
 
diff --git a/kube/patch.sh b/kube/patch.sh
index 944a6fe8..e5ef9911 100755
--- a/kube/patch.sh
+++ b/kube/patch.sh
@@ -12,6 +12,9 @@ if [  $# -le 1 ]; then
   exit 1
 fi
 
+# Override to use a different Docker image name for the sidecar.
+export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar'}
+
 kubectl -n "${KUBE_NAMESPACE}" patch "$1" "$2" --type strategic --patch "
 spec:
   template:

From c784a3d98f74a76b520621b2ef94607ddbf03243 Mon Sep 17 00:00:00 2001
From: "David B. Tucker" <dbtucker@google.com>
Date: Fri, 5 Apr 2019 18:34:57 -0400
Subject: [PATCH 3/5] Fix typo.

---
 kube/patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kube/patch.sh b/kube/patch.sh
index e5ef9911..57d05dd6 100755
--- a/kube/patch.sh
+++ b/kube/patch.sh
@@ -13,7 +13,7 @@ if [  $# -le 1 ]; then
 fi
 
 # Override to use a different Docker image name for the sidecar.
-export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar'}
+export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-prometheus/stackdriver-prometheus-sidecar'}
 
 kubectl -n "${KUBE_NAMESPACE}" patch "$1" "$2" --type strategic --patch "
 spec:

From 25961e3cf05bc69dac875df382e573db87c68895 Mon Sep 17 00:00:00 2001
From: "David B. Tucker" <dbtucker@google.com>
Date: Fri, 5 Apr 2019 18:38:07 -0400
Subject: [PATCH 4/5] Fix typo in docs.

---
 kube/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kube/README.md b/kube/README.md
index 9047f3ad..db0c66ea 100644
--- a/kube/README.md
+++ b/kube/README.md
@@ -12,7 +12,7 @@ Required environment variables:
 
 Optional environment variables:
 * `SIDECAR_IMAGE_NAME`: Image name parameter for the sidecar (default:
-  gcr.io/stackdriver-kubernetes-1337/stackdriver-prometheus-sidecar)
+  gcr.io/stackdriver-kubernetes-prometheus/stackdriver-prometheus-sidecar)
 
 If your cluster is not the default context:
 

From 0b3b307615faa7d1ec068044acc2a4aaf2ae40d5 Mon Sep 17 00:00:00 2001
From: "David B. Tucker" <dbtucker@google.com>
Date: Fri, 5 Apr 2019 18:39:38 -0400
Subject: [PATCH 5/5] Fix typos for real.

---
 kube/README.md | 2 +-
 kube/patch.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kube/README.md b/kube/README.md
index db0c66ea..70c64b05 100644
--- a/kube/README.md
+++ b/kube/README.md
@@ -12,7 +12,7 @@ Required environment variables:
 
 Optional environment variables:
 * `SIDECAR_IMAGE_NAME`: Image name parameter for the sidecar (default:
-  gcr.io/stackdriver-kubernetes-prometheus/stackdriver-prometheus-sidecar)
+  gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar)
 
 If your cluster is not the default context:
 
diff --git a/kube/patch.sh b/kube/patch.sh
index 57d05dd6..f6f8d6c8 100755
--- a/kube/patch.sh
+++ b/kube/patch.sh
@@ -13,7 +13,7 @@ if [  $# -le 1 ]; then
 fi
 
 # Override to use a different Docker image name for the sidecar.
-export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-kubernetes-prometheus/stackdriver-prometheus-sidecar'}
+export SIDECAR_IMAGE_NAME=${SIDECAR_IMAGE_NAME:-'gcr.io/stackdriver-prometheus/stackdriver-prometheus-sidecar'}
 
 kubectl -n "${KUBE_NAMESPACE}" patch "$1" "$2" --type strategic --patch "
 spec: