Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Calico version to v3.8.1 #554

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Update Calico version to v3.8.1 #554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1b2f2d
Update Calico to v3.8.1
lmm Aug 1, 2019
0396314
Update deprecated apiVersions and fields
lmm Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 119 additions & 25 deletions config/v1.5/calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
kind: DaemonSet
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: calico-node
namespace: kube-system
Expand Down Expand Up @@ -37,7 +37,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 @@ -154,22 +154,64 @@ metadata:
spec:
scope: Cluster
group: crd.projectcalico.org
version: v1
versions:
- name: v1
served: true
storage: true
names:
kind: FelixConfiguration
plural: felixconfigurations
singular: felixconfiguration

---

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:
name: bgpconfigurations.crd.projectcalico.org
spec:
scope: Cluster
group: crd.projectcalico.org
version: v1
versions:
- name: v1
served: true
storage: true
names:
kind: BGPConfiguration
plural: bgpconfigurations
Expand All @@ -183,7 +225,10 @@ metadata:
spec:
scope: Cluster
group: crd.projectcalico.org
version: v1
versions:
- name: v1
served: true
storage: true
names:
kind: BGPPeer
plural: bgppeers
Expand All @@ -197,7 +242,10 @@ metadata:
spec:
scope: Cluster
group: crd.projectcalico.org
version: v1
versions:
- name: v1
served: true
storage: true
names:
kind: IPPool
plural: ippools
Expand Down Expand Up @@ -295,6 +343,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 All @@ -306,7 +372,7 @@ metadata:
---

kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: calico-node
rules:
Expand All @@ -323,6 +389,12 @@ rules:
- pods/status
verbs:
- patch
- apiGroups: [""]
resources:
- nodes/status
verbs:
- patch
- update
- apiGroups: [""]
resources:
- pods
Expand Down Expand Up @@ -369,9 +441,11 @@ rules:
- globalbgpconfigs
- bgpconfigurations
- ippools
- ipamblocks
- globalnetworkpolicies
- globalnetworksets
- networkpolicies
- networksets
- clusterinformations
- hostendpoints
verbs:
Expand All @@ -380,10 +454,26 @@ 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

---

apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: calico-node
Expand All @@ -398,7 +488,7 @@ subjects:

---

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: calico-typha
Expand All @@ -407,6 +497,9 @@ metadata:
k8s-app: calico-typha
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
k8s-app: calico-typha
template:
metadata:
labels:
Expand All @@ -424,7 +517,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 @@ -457,19 +550,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 All @@ -489,7 +580,7 @@ spec:
k8s-app: calico-typha

---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: typha-cpha
Expand All @@ -504,7 +595,7 @@ subjects:

---

apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: typha-cpha
Expand Down Expand Up @@ -539,14 +630,17 @@ data:

---

apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: calico-typha-horizontal-autoscaler
namespace: kube-system
labels:
k8s-app: calico-typha-autoscaler
spec:
selector:
matchLabels:
k8s-app: calico-typha-autoscaler
replicas: 1
template:
metadata:
Expand Down Expand Up @@ -576,7 +670,7 @@ spec:

---

apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: typha-cpha
Expand All @@ -599,7 +693,7 @@ metadata:

---

apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: typha-cpha
Expand Down