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.

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

Update the v1.7 calico manifest to Calico v3.17.1 #1328

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
31 changes: 26 additions & 5 deletions config/v1.7/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: quay.io/calico/node:v3.15.1
image: docker.io/calico/node:v3.17.1
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
name: kubernetes-services-endpoint
optional: true
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down Expand Up @@ -114,6 +119,13 @@ spec:
- mountPath: /var/lib/calico
name: var-lib-calico
readOnly: false
# For eBPF mode, we need to be able to mount the BPF filesystem at /sys/fs/bpf so we mount in the
# parent directory.
- name: sysfs
mountPath: /sys/fs/
# Bidirectional means that, if we mount the BPF filesystem at /sys/fs/bpf it will propagate to the host.
# If the host is known to mount that filesystem already then Bidirectional can be omitted.
mountPropagation: Bidirectional
volumes:
# Used to ensure proper kmods are installed.
- name: lib-modules
Expand All @@ -129,6 +141,10 @@ spec:
hostPath:
path: /run/xtables.lock
type: FileOrCreate
- name: sysfs
hostPath:
path: /sys/fs/
type: DirectoryOrCreate
tolerations:
# Make sure calico/node gets scheduled on all nodes.
- effect: NoSchedule
Expand Down Expand Up @@ -373,13 +389,13 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: calico-node
rules:
# The CNI plugin needs to get pods, nodes, configmaps, and namespaces.
# The CNI plugin needs to get pods, nodes, configmaps and namespaces.
- apiGroups: [""]
resources:
- pods
- nodes
- namespaces
- configmaps
- namespaces
verbs:
- get
- apiGroups: [""]
Expand Down Expand Up @@ -549,12 +565,17 @@ spec:
securityContext:
fsGroup: 65534
containers:
- image: quay.io/calico/typha:v3.15.1
- image: docker.io/calico/typha:v3.17.1
name: calico-typha
ports:
- containerPort: 5473
name: calico-typha
protocol: TCP
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
name: kubernetes-services-endpoint
optional: true
env:
# Use eni not cali for interface prefix
- name: FELIX_INTERFACEPREFIX
Expand Down Expand Up @@ -686,7 +707,7 @@ spec:
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1
- image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3
name: autoscaler
command:
- /cluster-proportional-autoscaler
Expand Down