[
https://issues.apache.org/jira/browse/AIRFLOW-5873?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
David de L. updated AIRFLOW-5873:
---------------------------------
Description:
There are two PR's for this task, one targeted at v1-10-test branch, and one
adapted to master branch.
* `KubernetesPodOperator` kwarg `resources` is erroneously passed to
`base_operator`, instead should only go to `PodGenerator`. The two have
different syntax. (both on `master` and `v1-10-test` branches)
* `resources` passed to PodGenerator [should be
`k8s.V1ResourceRequirements`]([https://github.com/kubernetes-client/python/blob/3739db034d34b035bc8141740e9073c84ab192c0/kubernetes/client/models/v1_container.py#L45]),
which is now handled in `KubernetesPodOperator`
* `kubernetes/pod.py`: `Resources` does not have `__slots__` so accepts
arbitrary values in `setattr` (not present on either branch
https://github.com/apache/airflow/blame/50343040ff4679e32e01f138ead80bc4bcef4b47/airflow/contrib/operators/kubernetes_pod_operator.py#L166-L171)
* `v1-10-test` is behind `master` with KubernetesPodOperator fixes and
refactors
** e.g. move kubernetes folder one level up from `/contrib`
[https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L21]
** fix `xcom_push` to `do_xcom_push`
[https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L90]
was:
* `KubernetesPodOperator` kwarg `resources` is erroneously passed to
`base_operator`, instead should only go to `PodGenerator`. The two have
different syntax. (both on `master` and `v1-10-test` branches)
* `resources` passed to PodGenerator [should be
`k8s.V1ResourceRequirements`](https://github.com/kubernetes-client/python/blob/3739db034d34b035bc8141740e9073c84ab192c0/kubernetes/client/models/v1_container.py#L45),
which is now handled in `KubernetesPodOperator`
* `kubernetes/pod.py`: `Resources` does not have `__slots__` so accepts
arbitrary values in `setattr` (present on `v1-10-test` branch
[https://github.com/apache/airflow/blame/v1-10-test/airflow/contrib/operators/kubernetes_pod_operator.py#L166])
* `v1-10-test` is behind `master` with KubernetesPodOperator fixes and
refactors
** e.g. move kubernetes folder one level up from `/contrib`
[https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L21]
** fix `xcom_push` to `do_xcom_push`
[https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L90]
> KubernetesPodOperator fixes and test
> ------------------------------------
>
> Key: AIRFLOW-5873
> URL: https://issues.apache.org/jira/browse/AIRFLOW-5873
> Project: Apache Airflow
> Issue Type: Bug
> Components: operators
> Affects Versions: 1.10.6
> Reporter: David de L.
> Assignee: David de L.
> Priority: Major
> Fix For: 2.0.0, 1.10.7
>
>
> There are two PR's for this task, one targeted at v1-10-test branch, and one
> adapted to master branch.
> * `KubernetesPodOperator` kwarg `resources` is erroneously passed to
> `base_operator`, instead should only go to `PodGenerator`. The two have
> different syntax. (both on `master` and `v1-10-test` branches)
> * `resources` passed to PodGenerator [should be
> `k8s.V1ResourceRequirements`]([https://github.com/kubernetes-client/python/blob/3739db034d34b035bc8141740e9073c84ab192c0/kubernetes/client/models/v1_container.py#L45]),
> which is now handled in `KubernetesPodOperator`
> * `kubernetes/pod.py`: `Resources` does not have `__slots__` so accepts
> arbitrary values in `setattr` (not present on either branch
> https://github.com/apache/airflow/blame/50343040ff4679e32e01f138ead80bc4bcef4b47/airflow/contrib/operators/kubernetes_pod_operator.py#L166-L171)
> * `v1-10-test` is behind `master` with KubernetesPodOperator fixes and
> refactors
> ** e.g. move kubernetes folder one level up from `/contrib`
> [https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L21]
> ** fix `xcom_push` to `do_xcom_push`
> [https://github.com/apache/airflow/blame/4dd24a2c595d4042ffe745aed947eaaea6abb652/airflow/contrib/operators/kubernetes_pod_operator.py#L90]
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
