From 5b337f120cfed579f5cd17816059886268993e41 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Tue, 2 Dec 2014 11:32:45 -0800
Subject: [PATCH] Add some backward compatability for GKE.

(cherry picked from commit b07515c5ea63624485fb8058c251cd4055a336f0)
---
 cluster/saltbase/salt/generate-cert/init.sls | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/cluster/saltbase/salt/generate-cert/init.sls b/cluster/saltbase/salt/generate-cert/init.sls
index cfe53747b1e..78129a16413 100644
--- a/cluster/saltbase/salt/generate-cert/init.sls
+++ b/cluster/saltbase/salt/generate-cert/init.sls
@@ -43,3 +43,33 @@ kubernetes-cert:
     - user: root
     - group: root
     - shell: /bin/bash
+
+# These are introduced to ensure backwards compatability with older gcloud tools in GKE
+kubernetes-old-key:
+  file.copy:
+    - name: /usr/share/nginx/kubecfg.key
+    - source: /srv/kubernetes/kubecfg.key
+    - makedirs: True
+    - preserve: True
+    - require:
+      - cmd: kubernetes-cert
+
+
+kubernetes-old-cert:
+  file.copy:
+    - name: /usr/share/nginx/kubecfg.crt
+    - source: /srv/kubernetes/kubecfg.crt
+    - makedirs: True
+    - preserve: True
+    - require:
+      - cmd: kubernetes-cert
+
+
+kubernetes-old-ca:
+  file.copy:
+    - name: /usr/share/nginx/ca.crt
+    - source: /srv/kubernetes/ca.crt
+    - makedirs: True
+    - preserve: True
+    - require:
+      - cmd: kubernetes-cert