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

ci: Filter supported versions of GKE #32302

Merged
merged 3 commits into from
May 22, 2024
Merged

ci: Filter supported versions of GKE #32302

merged 3 commits into from
May 22, 2024

Conversation

marseel
Copy link
Contributor

@marseel marseel commented May 2, 2024

Whenever GKE stopped supporting a particular version of GKE, we had to
manually remove it from all stable branches. Now instead of that, we
will dynamically check if it's supported and only then run the test.

I will follow-up with the same approach for other cloud-providers.

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 2, 2024
@marseel marseel added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. labels May 2, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label May 2, 2024
@marseel
Copy link
Contributor Author

marseel commented May 2, 2024

/ci-gke

@marseel marseel added 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 needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels May 2, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.16 May 2, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.15.5 May 2, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.11 May 2, 2024
@marseel
Copy link
Contributor Author

marseel commented May 2, 2024

Example run where I added 1.23 version to matrix:
https://github.com/cilium/cilium/actions/runs/8922144762/job/24503735567

Fetching server config for us-west2-c
Removing version 1.23 as it's not valid for zone us-west2-c
Fetching server config for us-west2-c
Version 1.26 is valid for zone us-west2-c
Fetching server config for us-west3-a
Version 1.27 is valid for zone us-west3-a
Fetching server config for us-east4-b
Version 1.28 is valid for zone us-east4-b
Fetching server config for us-east1-c
Version 1.29 is valid for zone us-east1-c
Filtered matrix:
{
  "k8s": [
    {
      "version": "1.26",
      "zone": "us-west2-c",
      "vmIndex": 1
    },
    {
      "version": "1.27",
      "zone": "us-west3-a",
      "vmIndex": 2
    },
    {
      "version": "1.28",
      "zone": "us-east4-b",
      "vmIndex": 3
    },
    {
      "version": "1.29",
      "zone": "us-east1-c",
      "vmIndex": 4,
      "default": true
    }
  ],
  "config": [
    {
      "type": "no-tunnel",
      "index": 1
    },
    {
      "type": "tunnel",
      "index": 2,
      "cilium-install-opts": "--datapath-mode=tunnel"
    },
    {
      "type": "ipsec",
      "index": 3,
      "cilium-install-opts": "--helm-set=encryption.enabled=true --helm-set=encryption.type=ipsec"
    },
    {
      "type": "tunnel-ipsec",
      "index": 4,
      "cilium-install-opts": "--helm-set=encryption.enabled=true --helm-set=encryption.type=ipsec --datapath-mode=tunnel"
    }
  ]
}

@marseel marseel added the affects/v1.12 This issue affects v1.12 branch label May 2, 2024
@marseel marseel force-pushed the fix_ci branch 2 times, most recently from 280729c to 07f2a22 Compare May 2, 2024 10:13
@marseel marseel marked this pull request as ready for review May 2, 2024 10:16
@marseel marseel requested review from a team as code owners May 2, 2024 10:16
@marseel marseel requested review from giorio94, aanm and tklauser May 2, 2024 10:16
@marseel
Copy link
Contributor Author

marseel commented May 2, 2024

/test

@marseel
Copy link
Contributor Author

marseel commented May 2, 2024

/ci-gke

@marseel
Copy link
Contributor Author

marseel commented May 2, 2024

/test

@marseel marseel changed the title ci: Filter supported versions of GKE. ci: Filter supported versions of GKE May 2, 2024
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

LGTM, only nits inline which can be addressed as a follow-up.

.github/workflows/conformance-externalworkloads.yaml Outdated Show resolved Hide resolved
.github/workflows/conformance-gke.yaml Outdated Show resolved Hide resolved
@nebril nebril added this to Needs backport from main in 1.13.17 May 10, 2024
@nebril nebril removed this from Needs backport from main in 1.13.16 May 10, 2024
@nebril nebril added this to Needs backport from main in 1.14.12 May 10, 2024
@nebril nebril removed this from Needs backport from main in 1.14.11 May 10, 2024
@nebril nebril added this to Needs backport from main in 1.15.6 May 10, 2024
@nebril nebril removed this from Needs backport from main in 1.15.5 May 10, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 22, 2024
@aanm aanm added this pull request to the merge queue May 22, 2024
Merged via the queue into main with commit 87119e9 May 22, 2024
85 checks passed
@aanm aanm deleted the fix_ci branch May 22, 2024 10:27
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 23, 2024
15 tasks
@YutaroHayakawa YutaroHayakawa added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels May 23, 2024
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 24, 2024
12 tasks
@YutaroHayakawa YutaroHayakawa 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 May 24, 2024
@YutaroHayakawa YutaroHayakawa mentioned this pull request May 24, 2024
10 tasks
@YutaroHayakawa YutaroHayakawa 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 May 24, 2024
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels May 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/v1.12 This issue affects v1.12 branch area/CI Continuous Integration testing issue or flake 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. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. 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
1.13.17
Needs backport from main
1.14.12
Needs backport from main
1.15.6
Needs backport from main
Status: Released
Status: Released
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

6 participants