Skip to content

🐛 fix: e2e changes to remove v1.23#5297

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:mainfrom
richardcase:e2e_eks_changes
Jan 21, 2025
Merged

🐛 fix: e2e changes to remove v1.23#5297
k8s-ci-robot merged 1 commit intokubernetes-sigs:mainfrom
richardcase:e2e_eks_changes

Conversation

@richardcase
Copy link
Copy Markdown
Member

@richardcase richardcase commented Jan 21, 2025

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

This changes the EKS upgrade test to use a newer version of Kubernetes. It was using v1.23 which isn't supported.

Also, removed old CSI tests as they where testing upgrades to v1.23 for unmanaged clusters.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • includes emojis
  • adds unit tests
  • adds or updates e2e tests

Release note:

Updates to e2e tests to stop using v1.23

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 21, 2025
@k8s-ci-robot k8s-ci-robot added needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 21, 2025
@richardcase richardcase changed the title wip: e2e changes to remove v1.23 🐛 wip: e2e changes to remove v1.23 Jan 21, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2025
@richardcase richardcase changed the title 🐛 wip: e2e changes to remove v1.23 🐛 fix: e2e changes to remove v1.23 Jan 21, 2025
@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/test ?

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 21, 2025

@richardcase: The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-aws-build

/test pull-cluster-api-provider-aws-build-docker

/test pull-cluster-api-provider-aws-test

/test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-aws-apidiff-main

/test pull-cluster-api-provider-aws-e2e

/test pull-cluster-api-provider-aws-e2e-blocking

/test pull-cluster-api-provider-aws-e2e-clusterclass

/test pull-cluster-api-provider-aws-e2e-conformance

/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

/test pull-cluster-api-provider-aws-e2e-eks

/test pull-cluster-api-provider-aws-e2e-eks-gc

/test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-aws-apidiff-main

pull-cluster-api-provider-aws-build

pull-cluster-api-provider-aws-build-docker

pull-cluster-api-provider-aws-test

pull-cluster-api-provider-aws-verify
Details

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/test pull-cluster-api-provider-aws-e2e-eks

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 21, 2025
@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
fix: e2e changes to remove v1.23
d004496 
This changes the EKS upgrade test to use a newer version of Kubernetes.
It was using v1.23 which isn't supported.

Removed old CSI tests as they where testing upgrades to v1.23
for unmanaged clusters.

Removed references to CoreDNS addon in EKS tests.

Signed-off-by: Richard Case <richard.case@outlook.com>
@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

The EKS tests passed: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5297/pull-cluster-api-provider-aws-e2e-eks/1881698336373739520

nrb
nrb reviewed Jan 21, 2025
View reviewed changes
AndiDog
AndiDog reviewed Jan 21, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@AndiDog AndiDog left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 21, 2025
@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 21, 2025

/approve
/cherrypick release-2.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jan 21, 2025

@richardcase: once the present PR merges, I will cherry-pick it on top of release-2.7 in a new PR and assign it to you.

Details

In response to this:

/approve
/cherrypick release-2.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2025
@k8s-ci-robot k8s-ci-robot merged commit b29e04c into kubernetes-sigs:main Jan 21, 2025
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jan 21, 2025

@richardcase: new pull request created: #5310

Details

In response to this:

/approve
/cherrypick release-2.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jan 21, 2025
Merged
@richardcase
Copy link
Copy Markdown
Member Author

richardcase commented Jan 22, 2025

/cherrypick release-2.6

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jan 22, 2025

@richardcase: #5297 failed to apply on top of branch "release-2.6":

Applying: fix: e2e changes to remove v1.23
Using index info to reconstruct a base tree...
M	test/e2e/data/e2e_conf.yaml
M	test/e2e/data/e2e_eks_conf.yaml
M	test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
M	test/e2e/shared/defaults.go
M	test/e2e/suites/managed/eks_ipv6_test.go
M	test/e2e/suites/managed/eks_legacy_test.go
M	test/e2e/suites/managed/eks_test.go
M	test/e2e/suites/managed/upgrade_test.go
M	test/e2e/suites/unmanaged/helpers_test.go
M	test/e2e/suites/unmanaged/unmanaged_functional_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/suites/unmanaged/unmanaged_functional_test.go
CONFLICT (content): Merge conflict in test/e2e/suites/unmanaged/unmanaged_functional_test.go
Auto-merging test/e2e/suites/unmanaged/helpers_test.go
Auto-merging test/e2e/suites/managed/upgrade_test.go
Auto-merging test/e2e/suites/managed/eks_test.go
Auto-merging test/e2e/suites/managed/eks_legacy_test.go
Auto-merging test/e2e/suites/managed/eks_ipv6_test.go
Auto-merging test/e2e/shared/defaults.go
Auto-merging test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
Auto-merging test/e2e/data/e2e_eks_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_eks_conf.yaml
Auto-merging test/e2e/data/e2e_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_conf.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix: e2e changes to remove v1.23
Details

In response to this:

/cherrypick release-2.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@richardcase richardcase mentioned this pull request Jan 22, 2025
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nrb nrb nrb left review comments

@AndiDog AndiDog AndiDog left review comments

@luthermonson luthermonson Awaiting requested review from luthermonson

Assignees

@AndiDog AndiDog

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@richardcase @k8s-ci-robot @k8s-infra-cherrypick-robot @nrb @AndiDog