Merge branch 'bugfix/bump-kube-lib-salt-master' into q/130.0

Author: bert-e

images/salt-master/Dockerfile

@@ -18,7 +18,7 @@ gpgkey=https://downloads.scality.com/repository/redhat/\$releasever/saltstack/%s
  && microdnf update -y \
  && microdnf install -y glibc-all-langpacks langpacks-en python3-pip epel-release \
  && pip3 install "pip == 21.3.1" \
- && pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" "kubernetes ~= 12.0.1" \
+ && pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" "kubernetes ~= 30.1.0" \
  && microdnf install -y salt-master salt-api salt-ssh openssh-clients procps-ng \
  && microdnf remove -y epel-release \
  && microdnf clean all

salt/_modules/metalk8s_drain.py

@@ -19,7 +19,7 @@
     import kubernetes
     from kubernetes.client.rest import ApiException
     from kubernetes.client.models.v1_object_meta import V1ObjectMeta
-    from kubernetes.client.models.v1beta1_eviction import V1beta1Eviction
+    from kubernetes.client.models.v1_eviction import V1Eviction
     from urllib3.exceptions import HTTPError
 
     HAS_LIBS = True
@@ -531,7 +531,7 @@ def evict_pod(name, namespace="default", grace_period=1, **kwargs):
         client.request(
             "post",
             path,
-            body=V1beta1Eviction(delete_options=delete_options, metadata=object_meta),
+            body=V1Eviction(delete_options=delete_options, metadata=object_meta),
         )
     except (ApiException, HTTPError) as exc:
         if isinstance(exc, ApiException):

salt/tests/requirements.in

@@ -4,7 +4,7 @@ salt == 3002.9
 mock == 3.0.5
 parameterized == 0.7.4
 etcd3 != 0.11.0
-kubernetes == 12.0.1
+kubernetes == 30.1.0
 urllib3
 pyfakefs
 psutil

salt/tests/requirements.txt

@@ -144,9 +144,9 @@ jinja2==3.0.3 \
     --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \
     --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 \
     # via salt
-kubernetes==12.0.1 \
-    --hash=sha256:23c85d8571df8f56e773f1a413bc081537536dc47e2b5e8dc2e6262edb2c57ca \
-    --hash=sha256:ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa \
+kubernetes==30.1.0 \
+    --hash=sha256:41e4c77af9f28e7a6c314e3bd06a8c6229ddd787cad684e0ab9f69b498e98ebc \
+    --hash=sha256:e212e8b7579031dd2e512168b617373bc1e03888d41ac4e04039240a292d478d \
     # via -r /workspaces/metalk8s/salt/tests/requirements.in
 markupsafe==2.0.1 \
     --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \
@@ -291,7 +291,7 @@ msgpack==1.0.5 \
 oauthlib==3.2.2 \
     --hash=sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca \
     --hash=sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 \
-    # via requests-oauthlib
+    # via kubernetes, requests-oauthlib
 packaging==21.3 \
     --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
     --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 \