SEBA-508 Upgrade kubernetes library;
Fix pull step throwing exception
Change-Id: Ib03c58505e844c7d0c278e607b23c67cbe5655ac
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index aa533a0..099b0e9 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -15,7 +15,7 @@
# docker build -t xosproject/kubernetes-synchronizer:candidate -f Dockerfile.synchronizer .
# xosproject/kubernetes-synchronizer
-FROM xosproject/xos-synchronizer-base:2.2.1
+FROM xosproject/xos-synchronizer-base:2.2.2
COPY xos/synchronizer /opt/xos/synchronizers/kubernetes
COPY VERSION /opt/xos/synchronizers/kubernetes/
@@ -25,7 +25,7 @@
&& pip freeze > /var/xos/pip_freeze_pip_up_kubernetes_services_`date -u +%Y%m%dT%H%M%S`
# Workaround for kubernetes library issue, see CORD-3054
-RUN echo "c82c439bda07f29fd36f23552c4e763f /usr/local/lib/python2.7/dist-packages/kubernetes/client/api_client.py" | md5sum -c -
+RUN echo "7ef7f85c6da121fd96c0ba4a22517169 /usr/local/lib/python2.7/dist-packages/kubernetes/client/api_client.py" | md5sum -c -
COPY api_client.patch /tmp/api_client.patch
RUN patch -d /usr/local/lib/python2.7/dist-packages/kubernetes/client < /tmp/api_client.patch
diff --git a/pip_requested.txt b/pip_requested.txt
index e0877b9..7a51a8d 100644
--- a/pip_requested.txt
+++ b/pip_requested.txt
@@ -1 +1 @@
-kubernetes==6.0.0
+kubernetes==8.0.1
diff --git a/pip_requirements.txt b/pip_requirements.txt
index e8770d7..c71d8b4 100644
--- a/pip_requirements.txt
+++ b/pip_requirements.txt
@@ -1,5 +1,20 @@
-google-auth==1.4.1
-kubernetes==6.0.0
-oauthlib==2.0.7
-requests-oauthlib==0.8.0
-websocket-client==0.47.0
+kubernetes==8.0.1
+PyJWT==1.7.1
+adal==1.2.1
+cachetools==3.1.0
+certifi==2018.11.29
+cffi==1.12.2
+cryptography==2.6
+google-auth==1.6.3
+idna==2.8
+oauthlib==3.0.1
+pyasn1==0.4.5
+pyasn1-modules==0.2.4
+python-dateutil==2.8.0
+pyyaml==3.13
+requests==2.21.0
+requests-oauthlib==1.2.0
+setuptools==40.8.0
+six==1.12.0
+urllib3==1.24.1
+websocket-client==0.55.0
diff --git a/xos/synchronizer/pull_steps/pull_pods.py b/xos/synchronizer/pull_steps/pull_pods.py
index 661d304..0a92581 100644
--- a/xos/synchronizer/pull_steps/pull_pods.py
+++ b/xos/synchronizer/pull_steps/pull_pods.py
@@ -40,8 +40,8 @@
as necessary to fill the required dependencies of the KubernetesServiceInstance.
"""
- def __init__(self):
- super(KubernetesServiceInstancePullStep, self).__init__(observed_model=KubernetesServiceInstance)
+ def __init__(self, *args, **kwargs):
+ super(KubernetesServiceInstancePullStep, self).__init__(*args, observed_model=KubernetesServiceInstance, **kwargs)
self.init_kubernetes_client()