diff --git a/cluster/juju/charms/trusty/kubernetes/hooks/hooks.py b/cluster/juju/charms/trusty/kubernetes/hooks/hooks.py index 1a5e6645c636a..4b74753252583 100755 --- a/cluster/juju/charms/trusty/kubernetes/hooks/hooks.py +++ b/cluster/juju/charms/trusty/kubernetes/hooks/hooks.py @@ -216,7 +216,7 @@ def register_machine(apiserver, retry=False): response, result = registration_request.register(parsed.hostname, parsed.port, - '/api/v1beta3/nodes') + '/api/v1/nodes') print(response) 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 9a8ec37ac8a93..e764edbc722a2 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 @@ def test_data_type(self): @patch('json.loads') @patch('httplib.HTTPConnection') def test_register(self, httplibmock, jsonmock): - result = self.r.register('foo', 80, '/v1beta3/test') + result = self.r.register('foo', 80, '/v1/test') httplibmock.assert_called_with('foo', 80) requestmock = httplibmock().request requestmock.assert_called_with( - "POST", "/v1beta3/test", + "POST", "/v1/test", json.dumps(self.r.data), {"Content-type": "application/json", "Accept": "application/json"}) @@ -50,7 +50,7 @@ def test_register(self, httplibmock, jsonmock): def test_command_succeeded(self): response = MagicMock() - result = json.loads('{"status": "Failure", "kind": "Status", "code": 409, "apiVersion": "v1beta2", "reason": "AlreadyExists", "details": {"kind": "minion", "id": "10.200.147.200"}, "message": "minion \\"10.200.147.200\\" already exists", "creationTimestamp": null}') + result = json.loads('{"status": "Failure", "kind": "Status", "code": 409, "apiVersion": "v1", "reason": "AlreadyExists", "details": {"kind": "node", "name": "10.200.147.200"}, "message": "node \\"10.200.147.200\\" already exists", "creationTimestamp": null}') response.status = 200 self.r.command_succeeded(response, result) response.status = 500 diff --git a/cluster/libvirt-coreos/skydns-rc.yaml b/cluster/libvirt-coreos/skydns-rc.yaml index 7af68d93b456c..f31023be21ffa 100644 --- a/cluster/libvirt-coreos/skydns-rc.yaml +++ b/cluster/libvirt-coreos/skydns-rc.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: labels: diff --git a/cluster/libvirt-coreos/skydns-svc.yaml b/cluster/libvirt-coreos/skydns-svc.yaml index 65e6d43488ac0..a5c0610a58577 100644 --- a/cluster/libvirt-coreos/skydns-svc.yaml +++ b/cluster/libvirt-coreos/skydns-svc.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Service metadata: labels: diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index 35a4722b1badb..0cce224687089 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -183,7 +183,7 @@ function wait-cluster-readiness { local timeout=120 while [[ $timeout -ne 0 ]]; do - nb_ready_minions=$("${kubectl}" get nodes -o template -t "{{range.items}}{{range.status.conditions}}{{.type}}{{end}}:{{end}}" --api-version=v1beta3 2>/dev/null | tr ':' '\n' | grep -c Ready || true) + nb_ready_minions=$("${kubectl}" get nodes -o template -t "{{range.items}}{{range.status.conditions}}{{.type}}{{end}}:{{end}}" --api-version=v1 2>/dev/null | tr ':' '\n' | grep -c Ready || true) echo "Nb ready minions: $nb_ready_minions / $NUM_MINIONS" if [[ "$nb_ready_minions" -eq "$NUM_MINIONS" ]]; then return 0 diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 3cf0f26818f15..7a154bcfd6daa 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -61,8 +61,8 @@ ENABLE_CLUSTER_LOGGING=false ELASTICSEARCH_LOGGING_REPLICAS=1 # Optional: Cluster monitoring to setup as part of the cluster bring up: -# none - No cluster monitoring setup -# influxdb - Heapster, InfluxDB, and Grafana +# none - No cluster monitoring setup +# influxdb - Heapster, InfluxDB, and Grafana # google - Heapster, Google Cloud Monitoring, and Google Cloud Logging ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" @@ -81,4 +81,4 @@ DNS_REPLICAS=1 # Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev #RUNTIME_CONFIG="" -RUNTIME_CONFIG="api/v1beta3" +RUNTIME_CONFIG="api/v1" diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index 534298566b50d..b959ffbb1ce8a 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -228,7 +228,7 @@ function verify-cluster { local count="0" until [[ "$count" == "1" ]]; do local minions - minions=$("${KUBE_ROOT}/cluster/kubectl.sh" get nodes -o template -t '{{range.items}}{{.metadata.name}}:{{end}}' --api-version=v1beta3) + minions=$("${KUBE_ROOT}/cluster/kubectl.sh" get nodes -o template -t '{{range.items}}{{.metadata.name}}:{{end}}' --api-version=v1) count=$(echo $minions | grep -c "${MINION_IPS[i]}") || { printf "." sleep 2 diff --git a/contrib/ansible/roles/kubernetes-addons/files/kube-addon-update.sh b/contrib/ansible/roles/kubernetes-addons/files/kube-addon-update.sh index 373ca7fce54d9..731c6320246d4 100755 --- a/contrib/ansible/roles/kubernetes-addons/files/kube-addon-update.sh +++ b/contrib/ansible/roles/kubernetes-addons/files/kube-addon-update.sh @@ -185,7 +185,7 @@ function run-until-success() { # $1 object type function get-addons-from-server() { local -r obj_type=$1 - "${KUBECTL}" get "${obj_type}" -o template -t "{{range.items}}{{.metadata.name}} {{end}}" --api-version=v1beta3 -l kubernetes.io/cluster-service=true + "${KUBECTL}" get "${obj_type}" -o template -t "{{range.items}}{{.metadata.name}} {{end}}" --api-version=v1 -l kubernetes.io/cluster-service=true } # returns the characters after the last separator (including) diff --git a/contrib/ansible/roles/kubernetes-addons/files/kube-addons.sh b/contrib/ansible/roles/kubernetes-addons/files/kube-addons.sh index c07491c8fc82a..6781ca73f9c4a 100644 --- a/contrib/ansible/roles/kubernetes-addons/files/kube-addons.sh +++ b/contrib/ansible/roles/kubernetes-addons/files/kube-addons.sh @@ -76,7 +76,7 @@ EOF local -r kubeconfig_base64=$(echo "${kubeconfig}" | base64 -w0) read -r -d '' secretyaml <