Merge pull request #43 from consideRatio/pr/bump-calico-to-3.22

Drop support for k3s 1.19 or lower, bump calico to 3.21 for k3s 1.20, and calico 3.23 for k3s 1.21+

.github/workflows/test_k3s.yml

@@ -24,13 +24,14 @@ jobs:
  helm-version: ""
  - k3s-version: ""
  k3s-channel: stable
- helm-version: v3.6.3
+ helm-version: v3.9.0
  - k3s-version: ""
- k3s-channel: v1.18
+ k3s-channel: v1.21
  helm-version: v3.3.4
- - k3s-version: v1.17.13+k3s1
+ - k3s-version: v1.20.15+k3s1
  k3s-channel: ""
- helm-version: v3.2.4
+ helm-version: v3.5.0
+
  steps:
  - uses: actions/checkout@v3
  - name: Local action

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v3 - unreleased
+
+- The action drops support for use with k8s 1.19 and lower.
+- Calico bumped from 3.20 to 3.21 for when k3s 1.20 is used.
+- Calico bumped from 3.20 to 3.23 for when k3s 1.21+ is used.
+
 ## v2
 
 ### v2.0.0 - 2021-10-04

README.md

@@ -3,7 +3,7 @@
 [![GitHub Action badge](https:/jupyterhub/action-k3s-helm/workflows/Test/badge.svg)](https:/jupyterhub/action-k3s-helm/actions)
 
 Creates a Kubernetes cluster using [K3s](https://k3s.io/) (1.17+) with
-[Calico](https://www.projectcalico.org/) (3.20) for
+[Calico](https://www.projectcalico.org/) (3.23) for
 [NetworkPolicy](https://kubernetes.io/docs/concepts/services-networking/network-policies/)
 enforcement, and installs [Helm](https://helm.sh/) (3.1+).
 

action.yml

@@ -134,10 +134,14 @@ runs:
  #
  # ref: https://rancher.com/docs/k3s/latest/en/installation/network-options/
  #
- - name: Setup calico v3.20
+ - name: Setup calico
  run: |
- echo "::group::Setup calico v3.20"
- curl -sfL --output /tmp/calico.yaml https://docs.projectcalico.org/v3.20/manifests/calico.yaml
+ echo "::group::Setup calico"
+ if [[ "${{ inputs.k3s-version }}${{ inputs.k3s-channel }}" == v1.20* ]]; then
+ curl -sfL --output /tmp/calico.yaml https://docs.projectcalico.org/v3.21/manifests/calico.yaml
+ else
+ curl -sfL --output /tmp/calico.yaml https://projectcalico.docs.tigera.io/v3.23/manifests/calico.yaml
+ fi
  cat /tmp/calico.yaml \
  | sed '/"type": "calico"/a\
  "container_settings": {\