Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not hardcode the AWS VPC CNI plugin version in the conformance-aws-cni GHA workflow #28392

Merged
merged 1 commit into from Oct 5, 2023

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Oct 4, 2023

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

Link to successful run: https://github.com/cilium/cilium/actions/runs/6403302318

@giorio94 giorio94 added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. integration/cloud Related to integration with cloud environments such as AKS, EKS, GKE, etc. labels Oct 4, 2023
@giorio94
Copy link
Member Author

giorio94 commented Oct 4, 2023

/ci-awscni

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>
@giorio94 giorio94 force-pushed the pr/giorio94/main/conformance-aws-cni-plugin branch from efd202d to f31c6f8 Compare October 4, 2023 08:55
@giorio94 giorio94 marked this pull request as ready for review October 4, 2023 08:56
@giorio94 giorio94 requested review from a team as code owners October 4, 2023 08:56
@giorio94 giorio94 requested a review from brlbil October 4, 2023 08:56
@giorio94 giorio94 added needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 4, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.15 Oct 4, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.3 Oct 4, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.8 Oct 4, 2023
@giorio94
Copy link
Member Author

giorio94 commented Oct 4, 2023

Marking as ready to merge, as the PR only touches a GHA workflow.

@giorio94 giorio94 added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 4, 2023
@ti-mo ti-mo merged commit e773f96 into main Oct 5, 2023
44 checks passed
@ti-mo ti-mo deleted the pr/giorio94/main/conformance-aws-cni-plugin branch October 5, 2023 15:29
@sayboras sayboras mentioned this pull request Oct 6, 2023
9 tasks
@sayboras sayboras added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 6, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.3 Oct 6, 2023
@sayboras sayboras mentioned this pull request Oct 6, 2023
5 tasks
@sayboras sayboras added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Oct 6, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.8 Oct 6, 2023
@sayboras sayboras mentioned this pull request Oct 6, 2023
5 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.15 Oct 6, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.12 in 1.12.15 Oct 6, 2023
@github-actions github-actions bot added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Oct 6, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.13 in 1.13.8 Oct 6, 2023
@github-actions github-actions bot added the backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. label Oct 6, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.12 in 1.12.15 Oct 6, 2023
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Oct 9, 2023
@jrajahalme jrajahalme moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.3 Oct 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. integration/cloud Related to integration with cloud environments such as AKS, EKS, GKE, etc. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.12.15
Backport done to v1.12
1.14.3
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

None yet

4 participants