From db0a8e6b4a14bf402706376822d8df1bf0c2eb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Ingebrigtsen=20=C3=98vergaard?= Date: Wed, 19 Apr 2023 16:45:38 +0200 Subject: [PATCH 1/2] Update k8s client library to 0.22.0 This includes the change added in fiaas/k8s#112 to discard watch events if a valid Model instance can't be created. This should solve the issue described in #193. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2edd11bf..bf47f1f2 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def read(filename): "decorator < 5.0.0", # 5.0.0 and later drops py2 support (transitive dep from pinject) "six >= 1.12.0", "dnspython == 1.16.0", - "k8s == 0.21.4", + "k8s == 0.22.0", "appdirs == 1.4.3", "requests-toolbelt == 0.9.1", "backoff == 1.8.0", From af39ce1662503e53cd311809eee5be14d9ed2504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Ingebrigtsen=20=C3=98vergaard?= Date: Wed, 19 Apr 2023 16:47:17 +0200 Subject: [PATCH 2/2] Set "use v1 apiversions" flags in kind script v1 ingress and apiextensions has been available since Kubernetes 1.19, and are more likely than not to be correct for local testing which is what the script is used for --- bin/run_fdd_against_kind | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/run_fdd_against_kind b/bin/run_fdd_against_kind index fae703c0..9d55ead9 100755 --- a/bin/run_fdd_against_kind +++ b/bin/run_fdd_against_kind @@ -33,6 +33,8 @@ ARGS=( '--datadog-container-image' 'datadog/docker-dd-agent:12.2.5172-alpine' '--enable-crd-support' '--enable-service-account-per-app' +'--use-networkingv1-ingress' +'--use-apiextensionsv1-crd' ) (set -ux; fiaas-deploy-daemon "${ARGS[@]}")