Skip to content

Commit

Permalink
Merge pull request #1828 from manuelbuil/update_calico
Browse files Browse the repository at this point in the history
Update calico chart
  • Loading branch information
manuelbuil committed Sep 17, 2021
2 parents f23f591 + 81f6ee5 commit 0ea3a4d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -97,7 +97,7 @@ COPY charts/ /charts/
RUN echo ${CACHEBUST}>/dev/null
RUN CHART_VERSION="1.10.402" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.19.1-build2021061107" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.19.2-203" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.19.2-204" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v1.0.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.16.201-build2021072308" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="3.34.003" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
Expand Down
4 changes: 3 additions & 1 deletion docs/install/network_options.md
Expand Up @@ -36,7 +36,9 @@ Starting with RKE2 v1.21, different CNI Plugins can be deployed instead of Canal

For more information about values available for the Cilium chart, please refer to the [rke2-charts repository](https://github.com/rancher/rke2-charts/blob/main-source/packages/rke2-cilium/charts/values.yaml)

For more information about values available for the Calico chart, please refer to the [rke2-charts repository](https://github.com/rancher/rke2-charts/blob/main/charts/rke2-calico/rke2-calico/v3.18.1-103/values.yaml)
For more information about values available for the Calico chart, please refer to the [rke2-charts repository](https://github.com/rancher/rke2-charts/blob/main/charts/rke2-calico/rke2-calico/v3.19.2-204/values.yaml)

Note that if rke2 is deployed using a dual-stack cluster-cidr, calico will use BGP instead of vxlan encapsulation. Dual-stack cluster-cidr and BGP are currently not supported in the windows installation of rke2.

# Using Multus

Expand Down

0 comments on commit 0ea3a4d

Please sign in to comment.