You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/11/25 14:53:22 UTC
[GitHub] [airflow] ecerulm opened a new pull request #12619: Fix webserver ingress annotations
ecerulm opened a new pull request #12619:
URL: https://github.com/apache/airflow/pull/12619
The indentation under web.annotation was wrong (6 leading spaces
on first line, 4 on the next) leading to
Error converting YAMl to JSON: yaml: line 32: did not find expected key
when more that 1 annotation was provided.
@potiuk
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ecerulm commented on pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ecerulm commented on pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#issuecomment-734185937
@mik-laj I've added two tests, I had to do other changes unrelated to the ingress annotations because the current template output did not validate :
* upgrade the validation schemas from 1.12.9 to 1.14.0 (since 1.12.9 doesn't have `ingress-networking-v1beta1.json`
* don't generate `metadata.annotations` if empty
* don't generate `spec.rules[0].paths[].path` if empty
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ecerulm commented on a change in pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ecerulm commented on a change in pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#discussion_r530886819
##########
File path: chart/tests/helm_template_generator.py
##########
@@ -29,7 +29,7 @@
api_client = ApiClient()
-BASE_URL_SPEC = "https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/v1.12.9"
Review comment:
version 1.12.9 did not have `ingress-networking-v1beta1.json` so we could not validate the template output. Version 1.14.0 is the first to include `ingress-networkin-v1beta1.json`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb merged pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ashb merged pull request #12619:
URL: https://github.com/apache/airflow/pull/12619
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ecerulm commented on a change in pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ecerulm commented on a change in pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#discussion_r531012827
##########
File path: chart/tests/helm_template_generator.py
##########
@@ -29,7 +29,7 @@
api_client = ApiClient()
-BASE_URL_SPEC = "https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/v1.12.9"
Review comment:
Ok, I've raised the prerequisite to 1.14, but I 'd like to note that was already a prerequisite (if you wanted to use ingresses). But now we validate helm chart outputs (ingresses or not) to 1.14 so it's a good idea to require 1.14
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on a change in pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
mik-laj commented on a change in pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#discussion_r531055631
##########
File path: chart/tests/helm_template_generator.py
##########
@@ -29,7 +29,7 @@
api_client = ApiClient()
-BASE_URL_SPEC = "https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/v1.12.9"
Review comment:
We have a new test framework, which as you can see, came in handy and detected a problem that the previous tool did not detect.
See:
https://github.com/apache/airflow/issues/11657
https://github.com/apache/airflow/pull/12003
I am glad that we were able to detect this problem with this framework and can update the documentation.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on a change in pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
mik-laj commented on a change in pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#discussion_r530967061
##########
File path: chart/tests/helm_template_generator.py
##########
@@ -29,7 +29,7 @@
api_client = ApiClient()
-BASE_URL_SPEC = "https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/v1.12.9"
Review comment:
In that case, we also need to update README.md.
https://github.com/apache/airflow/tree/master/chart#prerequisites
This works for me as these versions are no longer supported by GCP, Azure, AWS, so we can raise the version requirements.
```
$ gcloud container get-server-config --zone us-central1-a
Fetching server config for us-central1-a
channels:
- channel: RAPID
defaultVersion: 1.18.10-gke.1500
validVersions:
- 1.18.10-gke.2101
- 1.18.10-gke.1500
- channel: REGULAR
defaultVersion: 1.17.12-gke.1504
validVersions:
- 1.17.13-gke.1400
- 1.17.12-gke.1504
- channel: STABLE
defaultVersion: 1.16.13-gke.404
validVersions:
- 1.16.15-gke.4300
- 1.16.13-gke.404
- 1.16.13-gke.401
- 1.15.12-gke.6001
- 1.15.12-gke.20
```
https://docs.microsoft.com/pl-pl/azure/aks/supported-kubernetes-versions#aks-kubernetes-release-calendar
https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] mik-laj commented on pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
mik-laj commented on pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#issuecomment-733877643
@ecerulm Can you add tests to avoid regression?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ashb commented on pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#issuecomment-754543031
Since the chart hasn't yet been released upgrading the minimum kube version is no problem.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#issuecomment-734201447
[The Workflow run](https://github.com/apache/airflow/actions/runs/384971458) is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] ecerulm commented on pull request #12619: Fix webserver ingress annotations
Posted by GitBox <gi...@apache.org>.
ecerulm commented on pull request #12619:
URL: https://github.com/apache/airflow/pull/12619#issuecomment-733781498
I should note that this is a regression introduced by #12003 [comment](https://github.com/apache/airflow/commit/3c85c2c16e845fa7eafaadf7a7598428e4022c6f#r44531631)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org