Merge #277

277: Upgrade kube from 0.63.1 to 0.65 r=soenkeliebau a=teozkr

## Description

## Review Checklist
- [x] Code contains useful comments
- [x] (Integration-)Test cases added (or not applicable)
- [x] Documentation added (or not applicable)
- [x] Changelog updated (or not applicable)


Co-authored-by: Teo Klestrup Röijezon <teo.roijezon@stackable.de>

Author: bors[bot]

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Changed
+- BREAKING: kube-rs 0.63.1 -> 0.65.0 ([#277])
+- strum 0.22.0 -> 0.23.0 ([#277])
+
+[#277]: https://github.com/stackabletech/operator-rs/pull/277
 
 ## [0.5.0] - 2021-12-09
 

Cargo.toml

@@ -16,7 +16,7 @@ either = "1.6.1"
 futures = "0.3.17"
 json-patch = "0.2.6"
 k8s-openapi = { version = "0.13.1", default-features = false, features = ["schemars", "v1_22"] }
-kube = { version = "0.63.1", features = ["jsonpatch", "runtime", "derive"] }
+kube = { version = "0.65.0", features = ["jsonpatch", "runtime", "derive"] }
 lazy_static = "1.4.0"
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.3.0" }
 rand = "0.8.4"
@@ -25,8 +25,8 @@ schemars = "0.8.6"
 serde = "1.0.130"
 serde_json = "1.0.68"
 serde_yaml = "0.8.21"
-strum = "0.22.0"
-strum_macros = "0.22.0"
+strum = "0.23.0"
+strum_macros = "0.23.1"
 thiserror = "1.0.30"
 tokio = { version = "1.12.0", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.29"

src/client.rs

@@ -518,7 +518,9 @@ impl Client {
 }
 
 pub async fn create_client(field_manager: Option<String>) -> OperatorResult<Client> {
-    let kubeconfig: Config = kube::Config::infer().await?;
+    let kubeconfig: Config = kube::Config::infer()
+        .await
+        .map_err(kube::Error::InferConfig)?;
     let default_namespace = kubeconfig.default_namespace.clone();
     Ok(Client::new(
         kube::Client::try_from(kubeconfig)?,

src/controller.rs

@@ -267,8 +267,8 @@ where
                         // An object may have been deleted after it was scheduled (but before it was executed). This is typically not an error.
                         trace!(err = &err as &(dyn std::error::Error + 'static), "ObjectNotFound in store, this is normal and will be retried")
                     },
-                    Err(err @ kube::runtime::controller::Error::QueueError { source: kube::runtime::watcher::Error::WatchFailed {..}, .. }) => {
-                        // This can happen when we lose the connection to the apiserver or the 
+                    Err(err @ kube::runtime::controller::Error::QueueError(kube::runtime::watcher::Error::WatchFailed {..})) => {
+                        // This can happen when we lose the connection to the apiserver or the
                         // connection gets interrupted for any other reason.
                         // kube-rs will usually try to restart the watch automatically.
                         warn!(err = &err as &(dyn std::error::Error + 'static), "controller watch failed, will retry")