Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,22 @@ jobs:
platform:
- runner: ubuntu-22.04
target: x86_64
maturin_args: ""
- runner: ubuntu-22.04
target: x86
maturin_args: ""
- runner: ubuntu-22.04
target: aarch64
maturin_args: --no-default-features --features openssl-tls,kubederive,ws,latest,runtime
- runner: ubuntu-22.04
target: armv7
maturin_args: --no-default-features --features openssl-tls,kubederive,ws,latest,runtime
- runner: ubuntu-22.04
target: s390x
maturin_args: ""
- runner: ubuntu-22.04
target: ppc64le
maturin_args: ""
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -45,7 +51,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist --find-interpreter ${{ matrix.platform.maturin_args }}
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
manylinux: auto
before-script-linux: |
Expand Down Expand Up @@ -83,12 +89,16 @@ jobs:
platform:
- runner: ubuntu-22.04
target: x86_64
maturin_args: ""
- runner: ubuntu-22.04
target: x86
maturin_args: ""
- runner: ubuntu-22.04
target: aarch64
maturin_args: --no-default-features --features openssl-tls,kubederive,ws,latest,runtime
- runner: ubuntu-22.04
target: armv7
maturin_args: --no-default-features --features openssl-tls,kubederive,ws,latest,runtime
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -98,7 +108,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter
args: --release --out dist --find-interpreter ${{ matrix.platform.maturin_args }}
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
manylinux: musllinux_1_2
before-script-linux: |
Expand Down
3 changes: 2 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ name = "portforward"
crate-type = ["cdylib"]

[features]
default = ["openssl-tls", "kubederive", "ws", "latest", "runtime"]
default = ["rustls-tls", "kubederive", "ws", "latest", "runtime"]
kubederive = ["kube/derive"]
openssl-tls = ["kube/client", "kube/openssl-tls"]
rustls-tls = ["kube/client", "kube/rustls-tls"]
rustls-tls = ["kube/client", "kube/rustls-tls", "kube/ring"]
runtime = ["kube/runtime", "kube/unstable-runtime"]
ws = ["kube/ws"]
latest = ["k8s-openapi/v1_32"]
Expand Down
42 changes: 41 additions & 1 deletion src/portforward.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,51 @@ async fn load_config(
options.context = Some(kube_context.to_string());
}

let client_config = kube::config::Config::from_custom_kubeconfig(kube_config, &options).await?;
// Some clusters (e.g., AKS private link) require a specific TLS SNI that
// is provided via `tls-server-name` in kubeconfig. kube-rs' OpenSSL backend
// does not honor this, which then causes hostname mismatch errors when
// connecting to the apiserver. We default to rustls and also explicitly set
// tls_server_name when it is missing from the resolved client config.
let tls_server_name = resolve_tls_server_name(&kube_config, &options);

let mut client_config =
kube::config::Config::from_custom_kubeconfig(kube_config, &options).await?;

if client_config.tls_server_name.is_none() {
if let Some(server_name) = tls_server_name {
debug!("setting tls_server_name from kubeconfig: {}", server_name);
client_config.tls_server_name = Some(server_name);
}
}

Ok(client_config)
}

fn resolve_tls_server_name(
kube_config: &kube::config::Kubeconfig,
options: &kube::config::KubeConfigOptions,
) -> Option<String> {
let context_name = options
.context
.as_deref()
.or(kube_config.current_context.as_deref())?;

let context = kube_config
.contexts
.iter()
.find(|c| c.name == context_name)?;
let context = context.context.as_ref()?;
let cluster_name = context.cluster.as_str();

let cluster = kube_config
.clusters
.iter()
.find(|c| c.name == cluster_name)?;

let cluster = cluster.cluster.as_ref()?;
cluster.tls_server_name.clone()
}

/// Tries to find a pod by the given or name or checks if it is a service
/// and if a pod matches the selector of the service.
///
Expand Down