remove proxy. update to kubeadm 1.8.0rc1

This commit is contained in:
Matthew Mosesohn 2017-09-25 07:14:10 +01:00
parent 05e5bc79f1
commit 1b2aa97219
4 changed files with 3 additions and 69 deletions

View file

@ -20,7 +20,7 @@ download_always_pull: False
# Versions # Versions
kube_version: v1.7.5 kube_version: v1.7.5
# Change to kube_version after v1.8.0 release # Change to kube_version after v1.8.0 release
kubeadm_version: "v1.8.0-beta.1" kubeadm_version: "v1.8.0-rc.1"
etcd_version: v3.2.4 etcd_version: v3.2.4
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download # after migration to container download
@ -39,7 +39,7 @@ kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release
# Checksums # Checksums
etcd_checksum: "274c46a7f8d26f7ae99d6880610f54933cbcf7f3beafa19236c52eb5df8c7a0b" etcd_checksum: "274c46a7f8d26f7ae99d6880610f54933cbcf7f3beafa19236c52eb5df8c7a0b"
kubeadm_checksum: "ddd5949699d6bdbc0b90b379e7e534f137b1058db1acc8f26cc54843f017ffbf" kubeadm_checksum: "8f6ceb26b8503bfc36a99574cf6f853be1c55405aa31669561608ad8099bf5bf"
# Containers # Containers
# Possible values: host, docker # Possible values: host, docker

View file

@ -18,17 +18,6 @@
with_items: ['deploy', 'svc'] with_items: ['deploy', 'svc']
tags: upgrade tags: upgrade
- name: Kubernetes Apps | Ensure kubeadm kube-proxy
kube:
name: "kube-proxy"
namespace: "{{ system_namespace }}"
kubectl: "{{bin_dir}}/kubectl"
resource: "daemonset"
state: latest
when:
- kubeadm_enabled|default(false)
- inventory_hostname == groups['kube-master'][0]
- name: Kubernetes Apps | Delete kubeadm kubedns - name: Kubernetes Apps | Delete kubeadm kubedns
kube: kube:
name: "kubedns" name: "kubedns"

View file

@ -1,56 +0,0 @@
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
labels:
k8s-app: kube-proxy
name: kube-proxy
namespace: {{ system_namespace }}
spec:
selector:
matchLabels:
k8s-app: kube-proxy
template:
metadata:
labels:
k8s-app: kube-proxy
spec:
containers:
- command:
- /usr/local/bin/kube-proxy
- --kubeconfig=/var/lib/kube-proxy/kubeconfig.conf
- --cluster-cidr=10.233.64.0/18
image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
name: kube-proxy
securityContext:
privileged: true
volumeMounts:
- mountPath: /var/lib/kube-proxy
name: kube-proxy
- mountPath: /run/xtables.lock
name: xtables-lock
dnsPolicy: ClusterFirst
hostNetwork: true
restartPolicy: Always
serviceAccount: kube-proxy
serviceAccountName: kube-proxy
terminationGracePeriodSeconds: 30
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
volumes:
- configMap:
defaultMode: 420
name: kube-proxy
name: kube-proxy
- hostPath:
path: /run/xtables.lock
name: xtables-lock
updateStrategy:
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate

View file

@ -75,6 +75,7 @@
with_items: with_items:
- "{{kube_config_dir}}" - "{{kube_config_dir}}"
- /var/lib/kubelet - /var/lib/kubelet
- /root/.kube
- "{{ etcd_data_dir }}" - "{{ etcd_data_dir }}"
- /etc/ssl/etcd - /etc/ssl/etcd
- /var/log/calico - /var/log/calico