Merge pull request #6790 from nikhiljindal/encoder

Removing references to v1beta1 from hack/ and test/

hack/e2e-suite/services.sh

@@ -73,40 +73,44 @@ function start_service() {
   echo "Starting service '$1' on port $2 with $3 replicas"
   svcs_to_clean+=("$1")
   ${KUBECTL} create -f - << __EOF__
-      {
-          "kind": "ReplicationController",
-          "apiVersion": "v1beta1",
-          "id": "$1",
-          "namespace": "default",
-          "desiredState": {
-              "replicas": $3,
-              "replicaSelector": {
-                  "name": "$1"
-              },
-              "podTemplate": {
-                  "desiredState": {
-                      "manifest": {
-                          "version": "v1beta2",
-                          "containers": [
-                              {
-                                  "name": "$1",
-                                  "image": "gcr.io/google_containers/serve_hostname:1.1",
-                                  "ports": [
-                                      {
-                                          "containerPort": 9376,
-                                          "protocol": "TCP"
-                                      }
-                                  ]
-                              }
-                          ]
-                      }
-                  },
-                  "labels": {
-                      "name": "$1"
-                  }
+{
+  "kind": "ReplicationController",
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "$1",
+    "namespace": "default",
+    "labels": {
+      "name": "$1"
+    }
+  },
+  "spec": {
+    "replicas": $3,
+    "selector": {
+      "name": "$1"
+    },
+    "template": {
+      "metadata": {
+        "labels": {
+          "name": "$1"
+        }
+      },
+      "spec": {
+        "containers": [
+          {
+            "name": "$1",
+            "image": "gcr.io/google_containers/serve_hostname:1.1",
+            "ports": [
+              {
+                "containerPort": 9376,
+                "protocol": "TCP"
               }
+            ]
           }
+        ]
       }
+    }
+  }
+}
 __EOF__
   # Convert '1.2.3.4 5.6.7.8' => '"1.2.3.4", "5.6.7.8"'
   local ip ips_array=() public_ips
@@ -115,22 +119,30 @@ __EOF__
   done
   public_ips=$(join ", " "${ips_array[@]:+${ips_array[@]}}")
   ${KUBECTL} create -f - << __EOF__
+{
+  "kind": "Service",
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "$1",
+    "namespace": "default",
+    "labels": {
+      "name": "$1"
+    }
+  },
+  "spec": {
+    "ports": [
       {
-          "kind": "Service",
-          "apiVersion": "v1beta1",
-          "id": "$1",
-          "namespace": "default",
-          "port": $2,
-          "protocol": "TCP",
-          "labels": {
-              "name": "$1"
-          },
-          "selector": {
-              "name": "$1"
-          },
-          "containerPort": 9376,
-          "publicIPs": [ ${public_ips} ]
+        "protocol": "TCP",
+        "port": $2,
+        "targetPort": 9376
       }
+    ],
+    "selector": {
+      "name": "$1"
+    },
+    "publicIPs": [ ${public_ips} ]
+  }
+}
 __EOF__
 }
 

hack/test-cmd.sh

@@ -108,7 +108,7 @@ kube::log::status "Starting CONTROLLER-MANAGER"
 CTLRMGR_PID=$!
 
 kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager: "
-kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1beta1/minions/127.0.0.1" "apiserver(minions): " 0.2 25
+kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1beta3/nodes/127.0.0.1" "apiserver(nodes): " 0.2 25
 
 # Expose kubectl directly for readability
 PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH
@@ -170,7 +170,7 @@ for version in "${kube_api_versions[@]}"; do
   kube::test::describe_object_assert pods 'valid-pod' "Name:" "Image(s):" "Host:" "Labels:" "Status:" "Replication Controllers"
 
   ### Dump current valid-pod POD
-  output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1beta1 "${kube_flags[@]}")
+  output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1beta3 "${kube_flags[@]}")
 
   ### Delete POD valid-pod by id
   # Pre-condition: valid-pod POD is running
@@ -396,22 +396,29 @@ for version in "${kube_api_versions[@]}"; do
   kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:kubernetes-ro:redis-master:'
   # Command
   kubectl create -f - "${kube_flags[@]}" << __EOF__
+{
+  "kind": "Service",
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "name": "service-${version}-test"
+  },
+  "spec": {
+    "ports": [
       {
-          "kind": "Service",
-          "apiVersion": "v1beta1",
-          "id": "service-${version}-test",
-          "port": 80,
-          "protocol": "TCP"
+        "protocol": "TCP",
+        "port": 80,
+        "targetPort": 80
       }
+    ]
+  }
+}
 __EOF__
   # Post-condition:redis-master-service service is running
   kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:kubernetes-ro:redis-master:service-.*-test:'
 
   # Command
-  kubectl update service "${kube_flags[@]}" service-${version}-test --patch="{\"selector\":{\"my\":\"test-label\"},\"apiVersion\":\"v1beta1\"}"
-  # Post-condition: selector.version == ${version}
-  # This test works only in v1beta1 and v1beta2
-  # https://github.com/GoogleCloudPlatform/kubernetes/issues/4771
+  kubectl update service "${kube_flags[@]}" service-${version}-test --patch="{\"spec\":{\"selector\":{\"my\":\"test-label\"}},\"apiVersion\":\"v1beta3\"}" --api-version=v1beta3
+  # Post-condition: selector has "test-label" label.
   kube::test::get_object_assert "service service-${version}-test" "{{range$service_selector_field}}{{.}}{{end}}" "test-label"
 
   ### Identity