Skip to content

Commit

Permalink
gha: do not hardcode AWS VPC CNI plugin version in conformance-aws-cni
Browse files Browse the repository at this point in the history
Currently, we are installing a fixed version of the AWS VPC CNI plugin
version (i.e., v1.11) regardless of the Kubernetes version. Yet, this
means that in certain cases we upgrade it, while in others we downgrade,
it, introducing unnecessary churn.

Let's instead use the default one that gets installed with the given
k8s version. Specifically, for the k8s versions currently tested:

* k8s: v1.23 - AWS VPC CNI: v1.10.4-eksbuild.1
* k8s: v1.24 - AWS VPC CNI: v1.11.4-eksbuild.1
* k8s: v1.25 - AWS VPC CNI: v1.12.2-eksbuild.1
* k8s: v1.26 - AWS VPC CNI: v1.12.5-eksbuild.2
* k8s: v1.27 - AWS VPC CNI: v1.12.6-eksbuild.2

Retrieved through:

for MINOR in $(seq 23 27)
do
    echo -n "k8s: v1.$MINOR - AWS VPC CNI: "
    aws eks describe-addon-versions --addon-name vpc-cni \
      --kubernetes-version 1.$MINOR --output yaml | \
      yq '.addons[].addonVersions[] | select(.compatibilities[].defaultVersion == true) | .addonVersion';
done

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
  • Loading branch information
giorio94 committed Oct 4, 2023
1 parent 5e5c3aa commit f31c6f8
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/conformance-aws-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,6 @@ jobs:
owner: "${{ steps.vars.outputs.owner }}"
version: ${{ matrix.version }}

- name: Update AWS VPC CNI plugin
run: |
kubectl apply -f https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/release-1.11/config/master/aws-k8s-cni.yaml
- name: Wait for images to be available
timeout-minutes: 30
shell: bash
Expand Down

0 comments on commit f31c6f8

Please sign in to comment.