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/04/21 22:11:49 UTC

[GitHub] [airflow] kaxil opened a new pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

kaxil opened a new pull request #15477:
URL: https://github.com/apache/airflow/pull/15477


   We create a Statefulset if persistence is enabled and Deployment
   otherwise. Upgrading strategies are different for both those types
   of resources.
   
   Statefulst needs `updateStrategy`, deployment needs `strategy`.
   
   Without this fix, using Helm Chart with CeleryExecutor failed with
   
   ```
   helm install airflow -n airflow --set executor=CeleryExecutor --set images.airflow.repository=k8s-dags --set images.airflow.tag=1.0.2 .
   Error: unable to build kubernetes objects from release manifest: error validating "": error validating data: ValidationError(StatefulSet.spec): unknown field "strategy" in io.k8s.api.apps.v1.StatefulSetSpec
   ```
   
   <!--
   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] kaxil merged pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
kaxil merged pull request #15477:
URL: https://github.com/apache/airflow/pull/15477


   


-- 
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 #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#issuecomment-824916240


   [The Workflow run](https://github.com/apache/airflow/actions/runs/774558213) is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^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] kaxil commented on a change in pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#discussion_r617960462



##########
File path: chart/templates/workers/worker-deployment.yaml
##########
@@ -46,8 +46,13 @@ spec:
       tier: airflow
       component: worker
       release: {{ .Release.Name }}
-  {{ if .Values.workers.updateStrategy }}
-{{ toYaml .Values.workers.updateStrategy | indent 2 }}
+  {{ if and $persistence .Values.workers.updateStrategy }}
+  updateStrategy:
+    {{- toYaml .Values.workers.updateStrategy | nindent 4 }}
+  {{- end }}
+  {{ if and (not $persistence) (.Values.workers.strategy) }}
+  strategy:
+    {{- toYaml .Values.workers.strategy | nindent 4 }}

Review comment:
       Just want to indent with a new line, without it I would need to have following:
   
   ```yaml
     strategy:
   {{ toYaml .Values.workers.strategy | nindent 4 }}
   ```
   
   I prefer (1) as it makes it clear the values are subkeys to strategy: key (just more readable to me)




-- 
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] kaxil closed pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
kaxil closed pull request #15477:
URL: https://github.com/apache/airflow/pull/15477


   


-- 
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 #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#issuecomment-824916988






-- 
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] ianstanton commented on a change in pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
ianstanton commented on a change in pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#discussion_r617971185



##########
File path: chart/values.schema.json
##########
@@ -561,8 +561,12 @@
                     "type": "integer"
                 },
                 "updateStrategy": {
-                    "description": "Specifies the strategy used to replace old Pods by new ones.",
-                    "type": "object"
+                    "description": "Specifies the strategy used to replace old Pods by new ones when deployed as a Statefulset.",

Review comment:
       ```suggestion
                       "description": "Specifies the strategy used to replace old Pods by new ones when deployed as a StatefulSet.",
   ```




-- 
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 #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#issuecomment-824904184


   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] ianstanton commented on a change in pull request #15477: Chart: Fix passing upgrading strategies to Celery Worker

Posted by GitBox <gi...@apache.org>.
ianstanton commented on a change in pull request #15477:
URL: https://github.com/apache/airflow/pull/15477#discussion_r617956397



##########
File path: chart/templates/workers/worker-deployment.yaml
##########
@@ -46,8 +46,13 @@ spec:
       tier: airflow
       component: worker
       release: {{ .Release.Name }}
-  {{ if .Values.workers.updateStrategy }}
-{{ toYaml .Values.workers.updateStrategy | indent 2 }}
+  {{ if and $persistence .Values.workers.updateStrategy }}
+  updateStrategy:
+    {{- toYaml .Values.workers.updateStrategy | nindent 4 }}
+  {{- end }}
+  {{ if and (not $persistence) (.Values.workers.strategy) }}
+  strategy:
+    {{- toYaml .Values.workers.strategy | nindent 4 }}

Review comment:
       @kaxil What's the reason for using `nindent` here?




-- 
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