From c54421b816c276e856140c887ffc6ea8df02def1 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Fri, 22 Oct 2021 09:49:37 +0200
Subject: [PATCH] Upgrade kubernetes client and ansible
---
requirements.in | 13 ++++---------
requirements.txt | 6 +++---
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/requirements.in b/requirements.in
index cf4e84c57..f4bb163a1 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,21 +6,16 @@
# to update requirements.txt.
# See https://pypi.org/project/pip-tools/#updating-requirements for more.
#
-#
# Please add developer dependencies which are not needed to install
# OpenAppStack to requirements-dev.txt!
-#
-# we need to update the mitogen plugin first in order to update to a newer
+
+# We need to update the mitogen plugin first in order to update to a newer
# ansible version
ansible<2.10
# needed for test_dns.py
dnspython
-# `install/generate_secrets.py` needs the `create_from_yaml` function that accepts
-# the `yaml_objects` parameter which was added in commit
-# 13814c0f7e0e587c46512386da3d08c64fc83e04. Until that is merged into a stable
-# release, we install from Git. Should be replaced with `kubernetes>18` some time
-# in the future.
--e git+git://github.com/kubernetes-client/python.git@2f9643eac71535f7802cd16a078ce50e8866f1ad#egg=kubernetes
+# Needed for `install/generate_secrets.py`
+kubernetes
# Needed for testinfra using the ansible module
paramiko
psutil
diff --git a/requirements.txt b/requirements.txt
index 83c915ff6..dbc1822fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,9 +6,7 @@
#
-e git+https://open.greenhost.net/greenhost/cloud-api#egg=greenhost_cloud
# via -r requirements.in
--e git+git://github.com/kubernetes-client/python.git@2f9643eac71535f7802cd16a078ce50e8866f1ad#egg=kubernetes
- # via -r requirements.in
-ansible==2.9.24
+ansible==2.9.27
# via -r requirements.in
attrs==21.2.0
# via pytest
@@ -48,6 +46,8 @@ jinja2==3.0.2
# jinja2-base64-filters
jinja2-base64-filters==0.1.4
# via -r requirements.in
+kubernetes==18.20.0
+ # via -r requirements.in
markupsafe==2.0.1
# via jinja2
oauthlib==3.1.1
--
GitLab