Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Update Calico to 3.1 #2521

Merged
merged 7 commits into from
Apr 23, 2018
Merged

Update Calico to 3.1 #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d761738
Update to calico v3
dtzar Feb 28, 2018
1fffd16
move svc account to top, bump latest image vers
dtzar Mar 24, 2018
73cec19
add EnsureExists addonmanager labels
dtzar Mar 24, 2018
169a721
Updates for 3.0 Calico
dtzar Mar 24, 2018
aacbc6f
Less nodes, SSD size
dtzar Mar 26, 2018
0a9db25
fix yaml spacing
dtzar Apr 2, 2018
bf7bcb9
Update Calico to 3.1.1
dtzar Apr 23, 2018
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
10 changes: 8 additions & 2 deletions examples/networkpolicy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,23 @@ The kubernetes-calico deployment template enables Calico networking and policies
}
```

<<<<<<< cca21c1a50cedc2631c9e73e9401be9fae0216f6
If `"orchestratorRelease": "1.8",` is set a K8s 1.8.x cluster will be provisioned. If `orchestratorRelease` is not specified a K8s 1.7.x cluster will be deployed. In either of these cases, this template will deploy the [v2.6 release](https://docs.projectcalico.org/v2.6/releases/) of [Kubernetes Datastore Install](https://docs.projectcalico.org/v2.6/getting-started/kubernetes/installation/hosted/kubernetes-datastore/) version of calico with the "Calico policy-only with user-supplied networking" which supports kubernetes ingress policies and has some limitations as denoted on the referenced page.
=======
This template will deploy the [v3.0 release](https://docs.projectcalico.org/v3.0/releases/) of [Kubernetes Datastore Install](https://docs.projectcalico.org/v3.0/getting-started/kubernetes/installation/hosted/kubernetes-datastore/) version of calico with the "Calico policy-only with user-supplied networking" which supports kubernetes ingress policies and has some limitations as denoted on the referenced page.
>>>>>>> Updates for 3.0 Calico

> Note: If deploying on a K8s 1.8 cluster, then egress policies are also supported!
> Note: The Typha service and deployment is installed on the cluster, but effectively disabled using the default settings of deployment replicas set to 0 and Typha service name not configured. Typha is recommended to be enabled when scaling to 50+ nodes on the cluster to reduce the load on the Kubernetes API server. If this functionality is desired to be configurable via the API model, please file an issue on Github requesting this feature be added. Otherwise, this can be manually changed via modifying and applying changes with the `/etc/kubernetes/addons/calico-daemonset.yaml` file on every master node in the cluster.

If deploying on a K8s 1.8 cluster, then egress policies are also supported!

If `orchestratorRelease` is set to 1.5 or 1.6, then this template will deploy the [v2.4.1 release](https://github.com/projectcalico/calico/releases/tag/v2.4.1) of [Kubernetes Datastore Install](https://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubernetes-datastore/) version of calico with the "Calico policy-only with user-supplied networking" which supports kubernetes ingress policies and has some limitations as denoted on the referenced page.

To understand how to deploy this template, please read the baseline [Kubernetes](../../docs/kubernetes.md) document and simply make sure to use the **kubernetes-calico.json** file in this folder which has the above referenced line to enable.

### Post installation

Once the template has been successfully deployed, following the [simple policy tutorial](https://docs.projectcalico.org/v2.6/getting-started/kubernetes/tutorials/simple-policy) or the [advanced policy tutorial](https://docs.projectcalico.org/v2.6/getting-started/kubernetes/tutorials/advanced-policy) will help to understand calico networking.
Once the template has been successfully deployed, following the [simple policy tutorial](https://docs.projectcalico.org/v3.0/getting-started/kubernetes/tutorials/simple-policy) or the [advanced policy tutorial](https://docs.projectcalico.org/v3.0/getting-started/kubernetes/tutorials/advanced-policy) will help to understand calico networking.

> Note: `ping` (ICMP) traffic is blocked on the cluster by default. Wherever `ping` is used in any tutorial substitute testing access with something like `wget -q --timeout=5 google.com -O -` instead.

Expand Down
10 changes: 2 additions & 8 deletions examples/networkpolicy/kubernetes-calico.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,13 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_DS2_v2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for the change to the VM SKU in the example api model?

Copy link
Contributor Author

@dtzar dtzar Apr 2, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this uses the faster premium storage based VMs and is the default on many other examples.

},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
},
{
"name": "agentpool2",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_DS2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
Expand Down
Loading