Merge pull request #8209 from krousey/v1beta1_cluster

Removing some v1beta1 uses in cluster/

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

cluster/aws/util.sh

@@ -667,7 +667,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

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

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

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"})

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

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
+apiVersion: v1beta3
-kind: Secret 
-id: token-${safe_username}
 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?

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