github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Edwards 2021-01-21 19:17:06 +00:00
parent f8ca5ad18a
commit 7575611fd5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-common.sh
View File

@ -158,7 +158,7 @@ export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-k
# Path for kube-proxy kubeconfig file on Windows nodes. # Path for kube-proxy kubeconfig file on Windows nodes.
export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig" export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
# Pause container image for Windows container. # 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. # 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" export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy # Version for csi-proxy

8
cluster/gce/windows/smoke-test.sh
View File

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