From c21e88f8d3382cf92573dec54993426e0cbfd027 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 23 Aug 2021 11:31:00 +0200 Subject: [PATCH 1/3] Make compatible with Kubernetes v1.22 certificates.k8s.io/v1beta1 is deprecated in v1.19+ and unavailable in v1.22+. krustlet is updated to a version which uses certificates.k8s.io/v1. --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07766b8..cc84ca6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1315,7 +1315,7 @@ dependencies = [ [[package]] name = "krator" version = "0.2.0" -source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#4d2d697c67d3a243bc1e1ae05f0602aacaa58138" +source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#ab5b00ac3997d2dc3b257b18bf17e5d264f41a5e" dependencies = [ "anyhow", "async-trait", @@ -1335,7 +1335,7 @@ dependencies = [ [[package]] name = "krator-derive" version = "0.1.0" -source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#4d2d697c67d3a243bc1e1ae05f0602aacaa58138" +source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#ab5b00ac3997d2dc3b257b18bf17e5d264f41a5e" dependencies = [ "quote", "syn", @@ -1409,7 +1409,7 @@ dependencies = [ [[package]] name = "kubelet" version = "0.7.0" -source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#4d2d697c67d3a243bc1e1ae05f0602aacaa58138" +source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#ab5b00ac3997d2dc3b257b18bf17e5d264f41a5e" dependencies = [ "anyhow", "async-stream", @@ -1773,7 +1773,7 @@ dependencies = [ [[package]] name = "oci-distribution" version = "0.6.0" -source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#4d2d697c67d3a243bc1e1ae05f0602aacaa58138" +source = "git+https://github.com/stackabletech/krustlet.git?branch=stackable_patches_v0.7.0#ab5b00ac3997d2dc3b257b18bf17e5d264f41a5e" dependencies = [ "anyhow", "futures-util", diff --git a/Cargo.toml b/Cargo.toml index 90422df..aa9b180 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ flate2 = "1.0" futures-util = "0.3" handlebars = "4.1" hostname = "0.3" -k8s-openapi = { version = "0.11", default-features = false, features = ["api", "v1_18"] } +k8s-openapi = { version = "0.11", default-features = false, features = ["api", "v1_20"] } krator = { git = "https://github.com/stackabletech/krustlet.git", branch = "stackable_patches_v0.7.0" } # version = "0.2" kube = { version= "0.48", default-features = false, features = ["derive", "native-tls"] } kubelet = { git = "https://github.com/stackabletech/krustlet.git", branch = "stackable_patches_v0.7.0", default-features = true, features= ["derive", "cli"] } # version = "0.7" From 1a97833d060d6476a25f92c3a7fa4f98926166f4 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 23 Aug 2021 11:42:39 +0200 Subject: [PATCH 2/3] Changelog updated --- CHANGELOG.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 9c6fc58..2af5418 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -3,10 +3,14 @@ == 0.6.0 - unreleased :262: https://github.com/stackabletech/agent/pull/262[#262] +:267: https://github.com/stackabletech/agent/pull/267[#267] === Changed * Lazy validation of repository URLs changed to eager validation ({262}). +* `certificates.k8s.io/v1` used instead of `certificates.k8s.io/v1beta1` + so that the Stackable Agent is now compatible with Kubernetes v1.22 + but not any longer with versions prior to v1.19 ({267}). == 0.5.0 - 2021-07-26 From 279d80581256b6af8c3c4d629030e584fd678514 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 23 Aug 2021 11:46:35 +0200 Subject: [PATCH 3/3] Add Kubernetes requirements to the docs --- docs/modules/ROOT/pages/limitations.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/modules/ROOT/pages/limitations.adoc b/docs/modules/ROOT/pages/limitations.adoc index 894de85..6a4bdf3 100644 --- a/docs/modules/ROOT/pages/limitations.adoc +++ b/docs/modules/ROOT/pages/limitations.adoc @@ -2,5 +2,6 @@ The Stackable Agent has limitations, some of which are documented here. +* Kubernetes v1.19+ is required. * The maximum number of pods supported by the agent is currently hardcoded to 110. This restriction can be lifted if the need arises.