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

Remove 1.25 from AKS versions (EOL on January 14th) #12962

Merged
merged 1 commit into from Jan 11, 2024

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Jan 11, 2024

What this PR does / why we need it:
https://learn.microsoft.com/en-us/azure/aks/supported-kubernetes-versions?tabs=azure-cli says 1.25 is soon going away.

What type of PR is this?
/kind chore

Does this PR introduce a user-facing change? Then add your Release Note here:

Remove 1.25 from list of supported versions on AKS (EOL on January 14th)

Documentation:

NONE

@kubermatic-bot kubermatic-bot 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. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Jan 11, 2024
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 11, 2024
@xrstf xrstf marked this pull request as ready for review January 11, 2024 11:49
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 11, 2024
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e3795098419c531fd55603ee975c8910f0b00122

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik

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

The pull request process is described here

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 11, 2024
@kubermatic-bot kubermatic-bot merged commit 8653798 into kubermatic:main Jan 11, 2024
16 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.25 milestone Jan 11, 2024
@xrstf xrstf deleted the azure-aks-versions branch January 11, 2024 13:00
@xrstf
Copy link
Contributor Author

xrstf commented Jan 11, 2024

/cherrypick release/v2.24

@xrstf
Copy link
Contributor Author

xrstf commented Jan 11, 2024

/cherrypick release/v2.23

@xrstf
Copy link
Contributor Author

xrstf commented Jan 11, 2024

/cherrypick release/v2.22

@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #12963

In response to this:

/cherrypick release/v2.24

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/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@xrstf: #12962 failed to apply on top of branch "release/v2.23":

Applying: remove 1.25 from AKS versions (EOL on January 14th)
Using index info to reconstruct a base tree...
M	docs/zz_generated.kubermaticConfiguration.ce.yaml
M	docs/zz_generated.kubermaticConfiguration.ee.yaml
M	pkg/defaulting/configuration.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/defaulting/configuration.go
CONFLICT (content): Merge conflict in pkg/defaulting/configuration.go
Auto-merging docs/zz_generated.kubermaticConfiguration.ee.yaml
CONFLICT (content): Merge conflict in docs/zz_generated.kubermaticConfiguration.ee.yaml
Auto-merging docs/zz_generated.kubermaticConfiguration.ce.yaml
CONFLICT (content): Merge conflict in docs/zz_generated.kubermaticConfiguration.ce.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 1.25 from AKS versions (EOL on January 14th)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.23

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/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@xrstf: #12962 failed to apply on top of branch "release/v2.22":

Applying: remove 1.25 from AKS versions (EOL on January 14th)
Using index info to reconstruct a base tree...
M	docs/zz_generated.kubermaticConfiguration.ce.yaml
M	docs/zz_generated.kubermaticConfiguration.ee.yaml
M	pkg/defaulting/configuration.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/defaulting/configuration.go
CONFLICT (content): Merge conflict in pkg/defaulting/configuration.go
Auto-merging docs/zz_generated.kubermaticConfiguration.ee.yaml
CONFLICT (content): Merge conflict in docs/zz_generated.kubermaticConfiguration.ee.yaml
Auto-merging docs/zz_generated.kubermaticConfiguration.ce.yaml
CONFLICT (content): Merge conflict in docs/zz_generated.kubermaticConfiguration.ce.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove 1.25 from AKS versions (EOL on January 14th)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.22

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/test-infra repository.

xrstf added a commit to xrstf/kubermatic that referenced this pull request Jan 11, 2024
xrstf added a commit to xrstf/kubermatic that referenced this pull request Jan 11, 2024
xrstf added a commit to xrstf/kubermatic that referenced this pull request Jan 11, 2024
xrstf added a commit to xrstf/kubermatic that referenced this pull request Jan 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants