ci(stability): merge the develop branch

Author: datacore-bolt-ci

Cargo.lock

@@ -25,6 +25,7 @@ console-logger = { path = "../../console-logger" }
 supportability = { path = "../supportability" }
 upgrade = { path = "../upgrade" }
 kube-proxy = { path = "../../dependencies/control-plane/k8s/proxy" }
+kube-forward = { path = "../../dependencies/control-plane/k8s/forward" }
 tokio = { version = "1.41.0" }
 anyhow = "1.0.92"
 clap = { version = "4.5.20", features = ["color", "derive"] }

dependencies/control-plane

@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use clap::Parser;
 use openapi::tower::client::Url;
 use plugin::{
@@ -160,6 +161,18 @@ impl From<anyhow::Error> for Error {
     }
 }
 
+impl From<kube_proxy::Error> for Error {
+    fn from(e: kube_proxy::Error) -> Self {
+        if let error @ kube_proxy::Error::Forward {
+            source: kube_forward::Error::ServiceNotFound { .. },
+        } = e
+        {
+            return Error::Generic(anyhow!("{error}\n Are you on the correct namespace?"));
+        }
+        Error::Generic(anyhow!(e))
+    }
+}
+
 /// Initialise the REST client.
 pub async fn init_rest(cli_args: &CliArgs) -> Result<(), Error> {
     // Use the supplied URL if there is one otherwise obtain one from the kubeconfig file.

k8s/plugin/Cargo.toml

@@ -13,7 +13,7 @@ pub(crate) enum EtcdError {
     K8sResource(K8sResourceError),
     IOError(std::io::Error),
     Custom(String),
-    CreateClient(anyhow::Error),
+    CreateClient(kube_proxy::Error),
 }
 
 impl From<StoreError> for EtcdError {

k8s/plugin/src/resources/mod.rs

@@ -206,7 +206,7 @@ pub enum Error {
 
     /// Openapi configuration error.
     #[snafu(display("openapi configuration Error: {}", source))]
-    OpenapiClientConfiguration { source: anyhow::Error },
+    OpenapiClientConfiguration { source: kube_proxy::Error },
 
     /// Error when opening a file.
     #[snafu(display("Failed to open file {}: {}", filepath.display(), source))]

k8s/supportability/src/collect/persistent_store/mod.rs

@@ -1,6 +1,7 @@
 { pkgs }:
 let
   lib = pkgs.lib;
+  sources = import ../sources.nix;
 in
 rec {
   makeRustTarget = platform: pkgs.rust.toRustTargetSpec platform;
@@ -30,7 +31,7 @@ rec {
     os = platform: builtins.replaceStrings [ "${platform.qemuArch}-" ] [ "" ] platform.system;
     hostPlatform = "${pkgs.rust.toRustTargetSpec pkgs.pkgsStatic.hostPlatform}";
     targetPlatform = "${pkgs.rust.toRustTargetSpec pkgs.pkgsCross."${target}".hostPlatform}";
-    pkgsTarget = if hostPlatform == targetPlatform then pkgs.pkgsStatic else pkgs.pkgsCross."${target}";
+    pkgsTarget = if hostPlatform == targetPlatform then pkgs else pkgs.pkgsCross."${target}";
     pkgsTargetNative = if hostPlatform == targetPlatform then pkgs else if hostOs == targetOs then
       import sources.nixpkgs
         {
@@ -63,14 +64,7 @@ rec {
     addPreBuild = "";
     nativeBuildInputs = with pkgs;
       [ pkg-config protobuf paperclip which git ] ++
-        [ rustPlatformDeps.pkgsTarget.stdenv.cc ] ++
-        lib.optional (rustPlatformDeps.pkgsTarget.hostPlatform.isDarwin)
-          [
-            (rustPlatformDeps.pkgsTarget.libiconv.override {
-              enableStatic = true;
-              enableShared = false;
-            })
-          ];
+        [ rustPlatformDeps.pkgsTarget.stdenv.cc ];
     addNativeBuildInputs = [ ];
     buildInputs = if (rustPlatformDeps.pkgsTarget.hostPlatform.isWindows) then with rustPlatformDeps.pkgsTargetNative.windows; [ mingw_w64_pthreads pthreads ] else [ ];
   };

k8s/upgrade/src/plugin/error.rs

@@ -15,19 +15,9 @@ let
   buildKubectlPlugin = { target, release, addBuildOptions ? [ ] }:
     let
       platformDeps = channel.rustPlatformDeps { inherit target sources; };
-      # required for darwin because its pkgsStatic is not static!
-      static_ssl = (platformDeps.pkgsTarget.pkgsStatic.openssl.override {
-        static = true;
-      });
       rustBuildOpts = channel.rustBuilderOpts { rustPlatformDeps = platformDeps; } // {
         buildOptions = [ "-p" "kubectl-plugin" ] ++ addBuildOptions;
-        ${if !pkgs.hostPlatform.isDarwin then "addNativeBuildInputs" else null} = [ platformDeps.pkgsTargetNative.pkgsStatic.openssl.dev ];
-        addPreBuild = preBuildOpenApi + ''
-          export OPENSSL_STATIC=1
-        '' + lib.optionalString (pkgs.hostPlatform.isDarwin) ''
-          export OPENSSL_LIB_DIR=${static_ssl.out}/lib
-          export OPENSSL_INCLUDE_DIR=${static_ssl.dev}/include
-        '';
+        addPreBuild = preBuildOpenApi;
       };
       name = "kubectl-plugin";
     in