Merge pull request #10606 from nikhiljindal/testsToV1

Update tests/examples to v1
This commit is contained in:
Zach Loafman
2015-07-01 15:53:54 -07:00
37 changed files with 117 additions and 242 deletions

View File

@@ -34,7 +34,7 @@ spec:
name: grafana
env:
- name: INFLUXDB_EXTERNAL_URL
value: /api/v1beta3/proxy/namespaces/default/services/monitoring-influxdb:api/db/
value: /api/v1/proxy/namespaces/default/services/monitoring-influxdb:api/db/
- name: INFLUXDB_HOST
value: monitoring-influxdb
- name: INFLUXDB_PORT

View File

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Service
metadata:
name: elasticsearch-logging

View File

@@ -1,5 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Service
metadata:
name: kibana-logging

View File

@@ -728,7 +728,7 @@ function kube-up {
-H "Authorization: Bearer ${KUBE_BEARER_TOKEN}" \
${secure} \
--max-time 5 --fail --output /dev/null --silent \
"https://${KUBE_MASTER_IP}/api/v1beta3/pods"; do
"https://${KUBE_MASTER_IP}/api/v1/pods"; do
printf "."
sleep 2
done

View File

@@ -1,5 +1,5 @@
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-master"},
"spec":{

View File

@@ -1,5 +1,5 @@
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-master"},
"spec":{

View File

@@ -1,5 +1,5 @@
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"etcd-server"},
"spec":{

View File

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Pod
metadata:
name: fluentd-elasticsearch

View File

@@ -1,4 +1,4 @@
apiVersion: v1beta3
apiVersion: v1
kind: Pod
metadata:
name: fluentd-cloud-logging

View File

@@ -192,7 +192,7 @@ function run-until-success() {
# returns a list of <namespace>/<name> pairs (nsnames)
function get-addon-nsnames-from-server() {
local -r obj_type=$1
"${KUBECTL}" get "${obj_type}" --all-namespaces -o template -t "{{range.items}}{{.metadata.namespace}}/{{.metadata.name}} {{end}}" --api-version=v1beta3 -l kubernetes.io/cluster-service=true
"${KUBECTL}" get "${obj_type}" --all-namespaces -o template -t "{{range.items}}{{.metadata.namespace}}/{{.metadata.name}} {{end}}" --api-version=v1 -l kubernetes.io/cluster-service=true
}
# returns the characters after the last separator (including)

View File

@@ -74,7 +74,7 @@ EOF
local -r kubeconfig_base64=$(echo "${kubeconfig}" | base64 -w0)
read -r -d '' secretyaml <<EOF
apiVersion: v1beta3
apiVersion: v1
data:
kubeconfig: ${kubeconfig_base64}
kind: Secret

View File

@@ -1,4 +1,4 @@
apiVersion: "v1beta3"
apiVersion: "v1"
kind: "LimitRange"
metadata:
name: "limits"

View File

@@ -89,7 +89,7 @@
{% set params = params + " " + cluster_name + " " + cert_file + " " + key_file + " --secure_port=" + secure_port + " " + token_auth_file + " " + bind_address + " " + pillar['log_level'] + " " + advertise_address + " " + proxy_ssh_options -%}
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"kube-apiserver"},
"spec":{

View File

@@ -37,7 +37,7 @@
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"kube-controller-manager"},
"spec":{

View File

@@ -1,5 +1,5 @@
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"kube-scheduler"},
"spec":{

View File

@@ -1,5 +1,5 @@
{
"apiVersion": "v1beta3",
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"nginx"},
"spec":{