Merge pull request #3200 from pablodav/feature/k8s_win_v1.11

Required support to start working on windows node support
This commit is contained in:
k8s-ci-robot
2018-09-03 04:51:23 -07:00
committed by GitHub
19 changed files with 85 additions and 1 deletions

View File

@@ -121,6 +121,7 @@
--ignore-preflight-errors=all
--allow-experimental-upgrades
--allow-release-candidate-upgrades
--force
register: kubeadm_upgrade
# Retry is because upload config sometimes fails
retries: 3

View File

@@ -12,6 +12,9 @@ spec:
{% if kube_version | version_compare('v1.6', '>=') %}
dnsPolicy: ClusterFirst
{% endif %}
# When having win nodes in cluster without this patch, this pod cloud try to be created in windows
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: kube-proxy
image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}

View File

@@ -7,6 +7,9 @@ metadata:
k8s-app: kube-nginx
spec:
hostNetwork: true
# When having win nodes in cluster without this patch, this pod cloud try to be created in windows
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: nginx-proxy
image: {{ nginx_image_repo }}:{{ nginx_image_tag }}