Fix GCE Windows Smoke Test and Support 2004 and 20H2.

cluster/gce/config-common.sh

@@ -158,7 +158,7 @@ export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-k
 # Path for kube-proxy kubeconfig file on Windows nodes.
 export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
 # Pause container image for Windows container.
-export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.2.1"
+export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.5.1"
 # Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
 export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
 # Version for csi-proxy

cluster/gce/windows/smoke-test.sh

@@ -40,7 +40,7 @@
 # Override this to use a different kubectl binary.
 kubectl=kubectl
 linux_deployment_timeout=60
-windows_deployment_timeout=300
+windows_deployment_timeout=600
 output_file=/tmp/k8s-smoke-test.out
 
 function check_windows_nodes_are_ready {
@@ -276,7 +276,7 @@ spec:
     spec:
       containers:
       - name: agnhost
-        image: e2eteam/agnhost:2.8
+        image: e2eteam/agnhost:2.26
         args:
         - serve-hostname
       nodeSelector:
@@ -358,7 +358,7 @@ spec:
     spec:
       containers:
       - name: pause-win
-        image: gcr.io/gke-release/pause-win:1.2.0
+        image: gcr.io/gke-release/pause-win:1.5.1
       nodeSelector:
         kubernetes.io/os: windows
       tolerations:
@@ -491,7 +491,7 @@ function test_linux_pod_to_k8s_service {
   # curl-ing the metrics-server service downloads 14 bytes of unprintable binary
   # data and sets a return code of success (0).
   if ! $kubectl exec "$linux_command_pod" -- \
-      curl -s -m 20 "http://$service_ip:$service_port" &> $output_file; then
+      curl -s -m 20 --insecure "https://$service_ip:$service_port" &> $output_file; then
     cleanup_deployments
     echo "Failing output: $(cat $output_file)"
     echo "FAILED: ${FUNCNAME[0]}"