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 2021/01/11 15:58:16 UTC
[GitHub] [airflow] FloChehab opened a new pull request #13615: Fix flower ingress annotations in chart
FloChehab opened a new pull request #13615:
URL: https://github.com/apache/airflow/pull/13615
Hello,
A small follow up to https://github.com/apache/airflow/pull/12010.
https://github.com/apache/airflow/pull/12010 introduced
a small bug in the way annotations are handled for the
flower ingress.
A test have been added to prevent this from occuring againg.
Also more conditionals have been added to the
flower-ingress.yaml file to make it compatible with schema
validation.
---
**^ 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] github-actions[bot] commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-758286289
The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest master or amend the last commit of the PR, and push it with --force-with-lease.
----------------------------------------------------------------
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] FloChehab commented on a change in pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
FloChehab commented on a change in pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#discussion_r571682199
##########
File path: chart/tests/test_ingress_flower.py
##########
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import unittest
+
+import jmespath
+
+from tests.helm_template_generator import render_chart
+
+
+class IngressFlowerTest(unittest.TestCase):
+ def test_should_pass_validation_with_just_ingress_enabled(self):
+ render_chart(
+ values={"ingress": {"enabled": True}, "executor": "CeleryExecutor"},
+ show_only=["templates/flower/flower-ingress.yaml"],
+ ) # checks that no validation exception is raised
+
+ def test_should_allow_more_than_one_annotation(self):
+ docs = render_chart(
+ values={
+ "ingress": {"enabled": True, "flower": {"annotations": {"aa": "bb", "cc": "dd"}}},
+ "executor": "CeleryExecutor",
+ },
+ show_only=["templates/flower/flower-ingress.yaml"],
+ )
+ self.assertEqual({"aa": "bb", "cc": "dd"}, jmespath.search("metadata.annotations", docs[0]))
Review comment:
:+1: fixed
----------------------------------------------------------------
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] dstandish commented on a change in pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
dstandish commented on a change in pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#discussion_r570732552
##########
File path: chart/tests/test_ingress_flower.py
##########
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import unittest
+
+import jmespath
+
+from tests.helm_template_generator import render_chart
+
+
+class IngressFlowerTest(unittest.TestCase):
+ def test_should_pass_validation_with_just_ingress_enabled(self):
+ render_chart(
+ values={"ingress": {"enabled": True}, "executor": "CeleryExecutor"},
+ show_only=["templates/flower/flower-ingress.yaml"],
+ ) # checks that no validation exception is raised
+
+ def test_should_allow_more_than_one_annotation(self):
+ docs = render_chart(
+ values={
+ "ingress": {"enabled": True, "flower": {"annotations": {"aa": "bb", "cc": "dd"}}},
+ "executor": "CeleryExecutor",
+ },
+ show_only=["templates/flower/flower-ingress.yaml"],
+ )
+ self.assertEqual({"aa": "bb", "cc": "dd"}, jmespath.search("metadata.annotations", docs[0]))
Review comment:
i think we use plain asserts now. @jmcarp recently went through whole codebase to standardize i think
----------------------------------------------------------------
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] dstandish commented on a change in pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
dstandish commented on a change in pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#discussion_r570732552
##########
File path: chart/tests/test_ingress_flower.py
##########
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import unittest
+
+import jmespath
+
+from tests.helm_template_generator import render_chart
+
+
+class IngressFlowerTest(unittest.TestCase):
+ def test_should_pass_validation_with_just_ingress_enabled(self):
+ render_chart(
+ values={"ingress": {"enabled": True}, "executor": "CeleryExecutor"},
+ show_only=["templates/flower/flower-ingress.yaml"],
+ ) # checks that no validation exception is raised
+
+ def test_should_allow_more_than_one_annotation(self):
+ docs = render_chart(
+ values={
+ "ingress": {"enabled": True, "flower": {"annotations": {"aa": "bb", "cc": "dd"}}},
+ "executor": "CeleryExecutor",
+ },
+ show_only=["templates/flower/flower-ingress.yaml"],
+ )
+ self.assertEqual({"aa": "bb", "cc": "dd"}, jmespath.search("metadata.annotations", docs[0]))
Review comment:
i think we use plain asserts now. @jmcarp recently went through whole codebase to standardize i think
----------------------------------------------------------------
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] potiuk commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-775561409
Thanks!
----------------------------------------------------------------
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] FloChehab commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
FloChehab commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-775402673
Hello @potiuk, I performed another rebase today, we should be good to merge!
----------------------------------------------------------------
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] FloChehab commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
FloChehab commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-758629737
> Can you please rebase @FloChehab ? We have some serious CI slow-downs (we are working on it) but this leads to some master broken more often than we would like to have. Apologies. Rebasing should fix the problem.
Done.
----------------------------------------------------------------
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 #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-758301415
[The Workflow run](https://github.com/apache/airflow/actions/runs/477948632) is cancelling this PR. Building images for the PR has failed. Follow the the workflow link to check the reason.
----------------------------------------------------------------
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] potiuk merged pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
potiuk merged pull request #13615:
URL: https://github.com/apache/airflow/pull/13615
----------------------------------------------------------------
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] potiuk commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-758561803
Can you please rebase @FloChehab ? We have some serious CI slow-downs (we are working on it) but this leads to some master broken more often than we would like to have. Apologies. Rebasing should fix the 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] FloChehab commented on pull request #13615: Fix flower ingress annotations in chart
Posted by GitBox <gi...@apache.org>.
FloChehab commented on pull request #13615:
URL: https://github.com/apache/airflow/pull/13615#issuecomment-758043214
Hello @mik-laj, here is a small bug fix for the PR we merged 2 days ago (https://github.com/apache/airflow/pull/12010).
----------------------------------------------------------------
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