Skip to content

Commit

Permalink
Update Calico to v3.8.1
Browse files Browse the repository at this point in the history
(cherry picked from commit 45a698d)
  • Loading branch information
lmm authored and mogren committed Oct 14, 2019
1 parent 6b213d7 commit a6aad04
Showing 1 changed file with 88 additions and 12 deletions.
100 changes: 88 additions & 12 deletions config/v1.5/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.3.6
image: quay.io/calico/node:v3.8.1
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down Expand Up @@ -160,6 +160,42 @@ spec:

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: ipamblocks.crd.projectcalico.org
spec:
scope: Cluster
group: crd.projectcalico.org
versions:
- name: v1
served: true
storage: true
names:
kind: IPAMBlock
plural: ipamblocks
singular: ipamblock

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: blockaffinities.crd.projectcalico.org
spec:
scope: Cluster
group: crd.projectcalico.org
versions:
- name: v1
served: true
storage: true
names:
kind: BlockAffinity
plural: blockaffinities
singular: blockaffinity

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -302,6 +338,24 @@ spec:

---

apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: networksets.crd.projectcalico.org
spec:
scope: Namespaced
group: crd.projectcalico.org
versions:
- name: v1
served: true
storage: true
names:
kind: NetworkSet
plural: networksets
singular: networkset

---

# Create the ServiceAccount and roles necessary for Calico.

apiVersion: v1
Expand Down Expand Up @@ -330,6 +384,12 @@ rules:
- pods/status
verbs:
- patch
- apiGroups: [""]
resources:
- nodes/status
verbs:
- patch
- update
- apiGroups: [""]
resources:
- pods
Expand Down Expand Up @@ -376,9 +436,11 @@ rules:
- globalbgpconfigs
- bgpconfigurations
- ippools
- ipamblocks
- globalnetworkpolicies
- globalnetworksets
- networkpolicies
- networksets
- clusterinformations
- hostendpoints
verbs:
Expand All @@ -387,6 +449,22 @@ rules:
- list
- update
- watch
- apiGroups: ["crd.projectcalico.org"]
resources:
- blockaffinities
- ipamblocks
- ipamhandles
verbs:
- get
- list
- create
- update
- delete
- apiGroups: ["crd.projectcalico.org"]
resources:
- blockaffinities
verbs:
- watch

---

Expand Down Expand Up @@ -434,7 +512,7 @@ spec:
hostNetwork: true
serviceAccountName: calico-node
containers:
- image: quay.io/calico/typha:v3.3.6
- image: quay.io/calico/typha:v3.8.1
name: calico-typha
ports:
- containerPort: 5473
Expand Down Expand Up @@ -467,19 +545,17 @@ spec:
- name: FELIX_IPTABLESMANGLEALLOWACTION
value: Return
livenessProbe:
exec:
command:
- calico-typha
- check
- liveness
httpGet:
path: /liveness
port: 9098
host: localhost
periodSeconds: 30
initialDelaySeconds: 30
readinessProbe:
exec:
command:
- calico-typha
- check
- readiness
httpGet:
path: /readiness
port: 9098
host: localhost
periodSeconds: 10

---
Expand Down

0 comments on commit a6aad04

Please sign in to comment.