From 98c457c3976ff0882d0bbd84acbc24d440949173 Mon Sep 17 00:00:00 2001
From: Kris Rousey <krousey@google.com>
Date: Wed, 13 May 2015 11:01:35 -0700
Subject: [PATCH] Updating /cluster to use v1beta 3 specs, and change a lot of
 polling to healthz instead of api endpoints.

---
 .../influxdb/influxdb-grafana-controller.yaml             | 2 +-
 cluster/aws/util.sh                                       | 2 +-
 cluster/azure/util.sh                                     | 2 +-
 cluster/gce/upgrade.sh                                    | 2 +-
 .../trusty/kubernetes/unit_tests/lib/test_registrator.py  | 4 ++--
 cluster/rackspace/util.sh                                 | 2 +-
 cluster/saltbase/salt/kube-addons/kube-addons.sh          | 8 +++++---
 cluster/vsphere/util.sh                                   | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
index 646cb19e8c1..545ec2e67df 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -27,7 +27,7 @@ spec:
           name: grafana
           env: 
             - name: INFLUXDB_EXTERNAL_URL
-              value: /api/v1beta1/proxy/services/monitoring-grafana/db/
+              value: /api/v1beta3/proxy/namespaces/default/services/monitoring-grafana/db/
             - name: INFLUXDB_HOST
               value: monitoring-influxdb
             - name: INFLUXDB_PORT
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 2629d3af27c..c0348ad2a26 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -627,7 +627,7 @@ function kube-up {
   echo
 
   until $(curl --insecure --user ${KUBE_USER}:${KUBE_PASSWORD} --max-time 5 \
-    --fail --output $LOG --silent https://${KUBE_MASTER_IP}/api/v1beta1/pods); do
+    --fail --output $LOG --silent https://${KUBE_MASTER_IP}/healthz); do
     printf "."
     sleep 2
   done
diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh
index 7b36474c77e..399c13ca59c 100644
--- a/cluster/azure/util.sh
+++ b/cluster/azure/util.sh
@@ -398,7 +398,7 @@ function kube-up {
     echo
 
     until curl --insecure --user "${KUBE_USER}:${KUBE_PASSWORD}" --max-time 5 \
-        --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/api/v1beta1/pods"; do
+        --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/healthz"; do
         printf "."
         sleep 2
     done
diff --git a/cluster/gce/upgrade.sh b/cluster/gce/upgrade.sh
index b952667336b..5b6fbdbc4e9 100755
--- a/cluster/gce/upgrade.sh
+++ b/cluster/gce/upgrade.sh
@@ -86,7 +86,7 @@ function wait-for-master() {
   echo "== Waiting for new master to respond to API requests =="
 
   until curl --insecure --user "${KUBE_USER}:${KUBE_PASSWORD}" --max-time 5 \
-    --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/api/v1beta1/pods"; do
+    --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/healthz"; do
     printf "."
     sleep 2
   done
diff --git a/cluster/juju/charms/trusty/kubernetes/unit_tests/lib/test_registrator.py b/cluster/juju/charms/trusty/kubernetes/unit_tests/lib/test_registrator.py
index 6c1238352c0..9a8ec37ac8a 100644
--- a/cluster/juju/charms/trusty/kubernetes/unit_tests/lib/test_registrator.py
+++ b/cluster/juju/charms/trusty/kubernetes/unit_tests/lib/test_registrator.py
@@ -37,12 +37,12 @@ class TestRegistrator():
     @patch('json.loads')
     @patch('httplib.HTTPConnection')
     def test_register(self, httplibmock, jsonmock):
-        result = self.r.register('foo', 80, '/v1beta1/test')
+        result = self.r.register('foo', 80, '/v1beta3/test')
 
         httplibmock.assert_called_with('foo', 80)
         requestmock = httplibmock().request
         requestmock.assert_called_with(
-                "POST", "/v1beta1/test",
+                "POST", "/v1beta3/test",
                 json.dumps(self.r.data),
                 {"Content-type": "application/json",
                  "Accept": "application/json"})
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 2f7553fdc78..fd4f5e24e57 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -311,7 +311,7 @@ kube-up() {
 
   #This will fail until apiserver salt is updated
   until $(curl --insecure --user ${KUBE_USER}:${KUBE_PASSWORD} --max-time 5 \
-          --fail --output /dev/null --silent https://${KUBE_MASTER_IP}/api/v1beta1/pods); do
+          --fail --output /dev/null --silent https://${KUBE_MASTER_IP}/healthz); do
       printf "."
       sleep 2
   done
diff --git a/cluster/saltbase/salt/kube-addons/kube-addons.sh b/cluster/saltbase/salt/kube-addons/kube-addons.sh
index c6131c89ecd..ee6d3dcf1aa 100644
--- a/cluster/saltbase/salt/kube-addons/kube-addons.sh
+++ b/cluster/saltbase/salt/kube-addons/kube-addons.sh
@@ -50,11 +50,13 @@ current-context: service-account-context
 EOF
   local -r kubeconfig_base64=$(echo "${kubeconfig}" | base64 -w0)
   read -r -d '' secretyaml <<EOF
-apiVersion: v1beta1
-kind: Secret 
-id: token-${safe_username}
+apiVersion: v1beta3
 data:
   kubeconfig: ${kubeconfig_base64}
+kind: Secret
+metadata:
+  name: token-${safe_username}
+type: Opaque
 EOF
   create-resource-from-string "${secretyaml}" 100 10 "Secret-for-token-for-user-${username}" &
 # TODO: label the secrets with special label so kubectl does not show these?
diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh
index 77675ca5a6e..c517b7d0c87 100755
--- a/cluster/vsphere/util.sh
+++ b/cluster/vsphere/util.sh
@@ -344,7 +344,7 @@ function kube-up {
 
   printf "Waiting for ${KUBE_MASTER} to become available..."
   until curl --insecure --user "${KUBE_USER}:${KUBE_PASSWORD}" --max-time 5 \
-          --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/api/v1beta1/pods"; do
+          --fail --output /dev/null --silent "https://${KUBE_MASTER_IP}/healthz"; do
       printf "."
       sleep 2
   done