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.

Sign up for GitHub

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

Jump to bottom

Kubernetes version bump #37040

Merged
merged 5 commits into from
Jan 29, 2024
Merged

Kubernetes version bump #37040

merged 5 commits into from
Jan 29, 2024

Conversation

dirrao
Copy link
Contributor

@dirrao dirrao commented Jan 27, 2024

close: #36678
extension: #36684

@boring-cyborg boring-cyborg bot added area:providers provider:cncf-kubernetes Kubernetes provider related issues labels Jan 27, 2024
@dirrao
Copy link
Contributor Author

dirrao commented Jan 27, 2024 •
edited
Loading

@potiuk
Prod image build failing due to user constraints. How to update the user constraints file and test?

#52 25.79 The conflict is caused by: [7496](https://github.com/apache/airflow/actions/runs/7676485430/job/20924456098?pr=37040#step:7:7567) #52 25.79 apache-airflow-providers-cncf-kubernetes 7.14.0.dev0 depends on kubernetes<=29.0.0 and >=28.1.0 [7497](https://github.com/apache/airflow/actions/runs/7676485430/job/20924456098?pr=37040#step:7:7568) #52 25.79 The user requested (constraint) kubernetes==23.6.0

@dirrao dirrao requested a review from potiuk January 27, 2024 09:04
@hussein-awala hussein-awala reopened this Jan 27, 2024
@hussein-awala
Copy link
Member

Close and reopen to run all the tests

@dirrao
Copy link
Contributor Author

dirrao commented Jan 27, 2024

#52 25.79 The conflict is caused by: [7496](https://github.com/apache/airflow/actions/runs/7676485430/job/20924456098?pr=37040#step:7:7567) #52 25.79 apache-airflow-providers-cncf-kubernetes 7.14.0.dev0 depends on kubernetes<=29.0.0 and >=28.1.0 [7497](https://github.com/apache/airflow/actions/runs/7676485430/job/20924456098?pr=37040#step:7:7568) #52 25.79 The user requested (constraint) kubernetes==23.6.0

I am still seeing the same issue.

@potiuk
Copy link
Member

potiuk commented Jan 28, 2024 •
edited
Loading

The problem was that you manually modified the provider_dependencies.json file and did not modify pyproject.toml (they are both generated from provider.yaml being the single source of truth).

Generally you shoudl only generate provider.yaml and all the rest should be automatically updated via pre-commit (so when you update provider.yaml, both generated/provider_dependencies.json and pyproject.toml are regenerated automatically).

I will add some protection against someone making similar mistake.

@potiuk
Copy link
Member

potiuk commented Jan 28, 2024

Protection against such manual updates here: #37052

@potiuk potiuk mentioned this pull request Jan 28, 2024
Closed
@potiuk potiuk force-pushed the kubernetes_version_bump branch from b5a8125 to cc21936 Compare January 28, 2024 10:45
@potiuk
Copy link
Member

potiuk commented Jan 29, 2024

Seems there are some errors to fix though

@potiuk
Copy link
Member

potiuk commented Jan 29, 2024

Looks like output of some tests is different than expected with the upgraded client (which is somewhat expected) - either the tests should be fixed or some of the "real" code updated.

FYI @dirrao -> the way how to run k8s tests locally is described here https://github.com/apache/airflow/blob/main/contributing-docs/testing/k8s_tests.rst step-by-step

@potiuk
Copy link
Member

potiuk commented Jan 29, 2024

You need to rebase and regenerate the deps @dirrao 👍

There is a need to regenerate /home/runner/work/airflow/airflow/generated/provider_dependencies.json
You need to run the following command locally and commit generated generated/provider_dependencies.json file:

breeze static-checks --type update-providers-dependencies --all-files

@potiuk
Copy link
Member

potiuk commented Jan 29, 2024

Main reason being this:

image

@dirrao
Copy link
Contributor Author

dirrao commented Jan 29, 2024

@potiuk
I have fixed rest of the issues. Thank you.

@dirrao dirrao changed the title Draft: kubernetes version bump Kubernetes version bump Jan 29, 2024
@potiuk
Copy link
Member

potiuk commented Jan 29, 2024

Oh. Fantastic ! Thank you !

@potiuk potiuk merged commit c36c4db into apache:main Jan 29, 2024
81 checks passed
potiuk pushed a commit that referenced this pull request Feb 7, 2024
@dirrao @potiuk
Kubernetes version bump (#37040)
8b28f22 
---------

Co-authored-by: Jarek Potiuk <[email protected]>
(cherry picked from commit c36c4db)
@potiuk potiuk added the changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) label Feb 8, 2024
@potiuk potiuk added this to the Airflow 2.8.2 milestone Feb 8, 2024
@dirrao dirrao mentioned this pull request Feb 8, 2024
Closed
2 tasks
This was referenced Feb 12, 2024
Closed
Closed
@Taragolis Taragolis mentioned this pull request Feb 20, 2024
Closed
2 tasks
ephraimbuddy pushed a commit that referenced this pull request Feb 22, 2024
@dirrao @ephraimbuddy
Kubernetes version bump (#37040)
009d954 
---------

Co-authored-by: Jarek Potiuk <[email protected]>
(cherry picked from commit c36c4db)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@potiuk potiuk potiuk approved these changes

@jedcunningham jedcunningham Awaiting requested review from jedcunningham

@hussein-awala hussein-awala Awaiting requested review from hussein-awala

Assignees
No one assigned
Labels
area:providers changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) provider:cncf-kubernetes Kubernetes provider related issues
Projects
None yet
Milestone
Airflow 2.8.2
Development

Successfully merging this pull request may close these issues.

apache-airflow-providers-cncf-kubernetes requires latest kubernetes version
3 participants
@dirrao @hussein-awala @potiuk