update calico to 2.6.2 (#1874)

Move RS to deployment so no need to take care of the revision history
limits :
  - Delete the old RS
  - Make Calico manifest a deployment
  - move deployments to apps/v1beta2 API since Kubernetes 1.8
This commit is contained in:
Kevin Lefevre
2017-11-28 13:01:30 +01:00
committed by Matthew Mosesohn
parent 8aafe64397
commit 9368dbe0e7
6 changed files with 28 additions and 39 deletions

View File

@@ -1,34 +1,34 @@
apiVersion: extensions/v1beta1
kind: ReplicaSet
apiVersion: apps/v1beta2
kind: Deployment
metadata:
name: calico-policy-controller
name: calico-kube-controllers
namespace: {{ system_namespace }}
labels:
k8s-app: calico-policy
k8s-app: calico-kube-controllers
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
matchLabels:
kubernetes.io/cluster-service: "true"
k8s-app: calico-policy
k8s-app: calico-kube-controllers
template:
metadata:
name: calico-policy-controller
name: calico-kube-controllers
namespace: {{ system_namespace }}
labels:
kubernetes.io/cluster-service: "true"
k8s-app: calico-policy
k8s-app: calico-kube-controllers
spec:
hostNetwork: true
{% if rbac_enabled %}
serviceAccountName: calico-policy-controller
serviceAccountName: calico-kube-controllers
{% endif %}
tolerations:
- effect: NoSchedule
operator: Exists
containers:
- name: calico-policy-controller
- name: calico-kube-controllers
image: {{ calico_policy_image_repo }}:{{ calico_policy_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
resources:

View File

@@ -2,7 +2,7 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: calico-policy-controller
name: calico-kube-controllers
namespace: {{ system_namespace }}
rules:
- apiGroups:

View File

@@ -2,12 +2,12 @@
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: calico-policy-controller
name: calico-kube-controllers
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: calico-policy-controller
name: calico-kube-controllers
subjects:
- kind: ServiceAccount
name: calico-policy-controller
name: calico-kube-controllers
namespace: {{ system_namespace }}

View File

@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: calico-policy-controller
name: calico-kube-controllers
namespace: {{ system_namespace }}
labels:
kubernetes.io/cluster-service: "true"