gistfile1.txt

0a1,2
> # Calico Version v3.6
> # https://docs.projectcalico.org/v3.6/release-notes/
12c14
<   # Configure the backend to use.
---
>   # Configure the Calico backend to use.
23c25
<       "cniVersion": "0.3.1",
---
>       "cniVersion": "0.3.0",
48d49
< 
50a52,54
> # Create all the CustomResourceDefinitions needed for
> # Calico policy and networking mode.
> 
54c58
<   name: felixconfigurations.crd.projectcalico.org
---
>    name: felixconfigurations.crd.projectcalico.org
242,256d245
< 
< ---
< 
< apiVersion: apiextensions.k8s.io/v1beta1
< kind: CustomResourceDefinition
< metadata:
<   name: networksets.crd.projectcalico.org
< spec:
<   scope: Namespaced
<   group: crd.projectcalico.org
<   version: v1
<   names:
<     kind: NetworkSet
<     plural: networksets
<     singular: networkset
263c252
< apiVersion: rbac.authorization.k8s.io/v1
---
> apiVersion: rbac.authorization.k8s.io/v1beta1
308c297
< apiVersion: rbac.authorization.k8s.io/v1
---
> apiVersion: rbac.authorization.k8s.io/v1beta1
323c312
< apiVersion: rbac.authorization.k8s.io/v1
---
> apiVersion: rbac.authorization.k8s.io/v1beta1
388d376
<       - networksets
391d378
<       - blockaffinities
453c440
< apiVersion: rbac.authorization.k8s.io/v1
---
> apiVersion: rbac.authorization.k8s.io/v1beta1
464a452
> ---
468,469c456,457
< # This manifest installs the calico-node container, as well
< # as the CNI plugins and network config on
---
> # This manifest installs the node container, as well
> # as the Calico CNI plugins and network config on
513d500
<       priorityClassName: system-node-critical
519,520c506
<           image: ssavas/cni-plugin:3.11
<           imagePullPolicy: Always
---
>           image: calico/cni:v3.6.0
537c523
<         # This container installs the CNI binaries
---
>         # This container installs the Calico CNI binaries
540,541c526
<           image: ssavas/cni-plugin:3.11
<           imagePullPolicy: Always
---
>           image: calico/cni:v3.6.0
572,579d556
<         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
<         # to communicate with Felix over the Policy Sync API.
<         - name: flexvol-driver
<           image: ssavas/pod2daemon:3.11
<           imagePullPolicy: Always
<           volumeMounts:
<           - name: flexvol-driver-host
<             mountPath: /host/driver
581c558
<         # Runs calico-node container on each Kubernetes node.  This
---
>         # Runs node container on each Kubernetes node.  This
585,586c562
<           image: ssavas/node:3.11
<           imagePullPolicy: Always
---
>           image: calico/node:v3.6.0
624c600
<               value: "100.96.0.0/11"
---
>               value: "${CLUSTER_CIDR}"
645,648c621,624
<             exec:
<               command:
<               - /bin/calico-node
<               - -felix-live
---
>             httpGet:
>               path: /liveness
>               port: 9099
>               host: localhost
656d631
<               - -felix-ready
657a633
>               - -felix-ready
672,673d647
<             - name: policysync
<               mountPath: /var/run/nodeagent
675c649
<         # Used by calico-node.
---
>         # Used by node.
702,711d675
<         # Used to create per-pod Unix Domain Sockets
<         - name: policysync
<           hostPath:
<             type: DirectoryOrCreate
<             path: /var/run/nodeagent
<         # Used to install Flex Volume Driver
<         - name: flexvol-driver-host
<           hostPath:
<             type: DirectoryOrCreate
<             path: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/nodeagent~uds
722c686
< 
---
> # This manifest deploys the Calico node controller.
730a695,696
>   annotations:
>     scheduler.alpha.kubernetes.io/critical-pod: ''
732c698
<   # The controllers can only have a single active instance.
---
>   # The controller can only have a single active instance.
733a700,701
>   strategy:
>     type: Recreate
737,738d704
<   strategy:
<     type: Recreate
745,746d710
<       annotations:
<         scheduler.alpha.kubernetes.io/critical-pod: ''
757d720
<       priorityClassName: system-cluster-critical
760,761c723
<           image: ssavas/kube-controllers:3.11
<           imagePullPolicy: Always
---
>           image: calico/kube-controllers:v3.6.0
789d750
<