From 4fccf3e9eccb8179b802725e816e423a3d3b824d Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Wed, 8 May 2024 09:12:51 -0500 Subject: [PATCH 01/15] Fix destination staleness issue when adding EndpointSlices (#12427) When updating the portPublisher's address set when a new EndpointSlice creation event is received, its addresses where getting overwritten with stale data whenever its IDs already existed in the current pp's address set. There can be pathological cases in single-stack where this can be a problem. For example when ES get recycled but the deletion event is not caught for some reason, when the addition event is received its Address data will be overwritten by the old stale entry. ## Other Changes - Remove overriding `newAddressSet.LocalTrafficPolicy` as that is already taken care inside `pp.endpointSliceToAddresses(slice)`. - When there are no Add events to send, return early without updating state nor updating metrics. --- .../api/destination/watcher/endpoints_watcher.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/controller/api/destination/watcher/endpoints_watcher.go b/controller/api/destination/watcher/endpoints_watcher.go index b4e9dba00af2c..69685af7f1eb9 100644 --- a/controller/api/destination/watcher/endpoints_watcher.go +++ b/controller/api/destination/watcher/endpoints_watcher.go @@ -795,15 +795,18 @@ func (pp *portPublisher) updateEndpoints(endpoints *corev1.Endpoints) { func (pp *portPublisher) addEndpointSlice(slice *discovery.EndpointSlice) { newAddressSet := pp.endpointSliceToAddresses(slice) for id, addr := range pp.addresses.Addresses { - newAddressSet.Addresses[id] = addr - newAddressSet.LocalTrafficPolicy = pp.localTrafficPolicy + if _, ok := newAddressSet.Addresses[id]; !ok { + newAddressSet.Addresses[id] = addr + } } add, _ := diffAddresses(pp.addresses, newAddressSet) - if len(add.Addresses) > 0 { - for _, listener := range pp.listeners { - listener.Add(add) - } + if len(add.Addresses) == 0 { + return + } + + for _, listener := range pp.listeners { + listener.Add(add) } pp.addresses = newAddressSet From afdfdebd93f800ba44c65b05676a9797b0cd4a8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 07:55:35 -0700 Subject: [PATCH 02/15] build(deps): bump anyhow from 1.0.82 to 1.0.83 (#12567) Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.82 to 1.0.83. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.82...1.0.83) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d9c73c683f01..f46f595dc1d22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,9 +74,9 @@ checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "async-stream" From 839851e527d9c890b025d87d48640610d4a7237a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 07:55:47 -0700 Subject: [PATCH 03/15] build(deps): bump rustc-demangle from 0.1.23 to 0.1.24 (#12566) Bumps [rustc-demangle](https://github.com/rust-lang/rustc-demangle) from 0.1.23 to 0.1.24. - [Commits](https://github.com/rust-lang/rustc-demangle/compare/0.1.23...0.1.24) --- updated-dependencies: - dependency-name: rustc-demangle dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f46f595dc1d22..dd3edc32b6d55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1847,9 +1847,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" From 5381fe7c0cfdb1c086905fb443477f8c1d1267e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 07:55:56 -0700 Subject: [PATCH 04/15] build(deps): bump ryu from 1.0.17 to 1.0.18 (#12568) Bumps [ryu](https://github.com/dtolnay/ryu) from 1.0.17 to 1.0.18. - [Release notes](https://github.com/dtolnay/ryu/releases) - [Commits](https://github.com/dtolnay/ryu/compare/1.0.17...1.0.18) --- updated-dependencies: - dependency-name: ryu dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd3edc32b6d55..184d0acf3dacd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1915,9 +1915,9 @@ checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" From c5b069e6117fb81bff9f9455b744997711f921a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 07:56:07 -0700 Subject: [PATCH 05/15] build(deps): bump cc from 1.0.96 to 1.0.97 (#12570) Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.96 to 1.0.97. - [Release notes](https://github.com/rust-lang/cc-rs/releases) - [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.96...1.0.97) --- updated-dependencies: - dependency-name: cc dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 184d0acf3dacd..7298cccfe46a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,9 +244,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-if" From c417829b7107309e6150aeab026d94b4bffbef4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 07:56:24 -0700 Subject: [PATCH 06/15] build(deps): bump serde from 1.0.200 to 1.0.201 (#12569) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.200 to 1.0.201. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.200...v1.0.201) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7298cccfe46a8..e0356667cfe60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2003,9 +2003,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] @@ -2022,9 +2022,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", From 0d815e00fd54c83c67ad220c334f319511aa5463 Mon Sep 17 00:00:00 2001 From: l5d-bot <48604953+l5d-bot@users.noreply.github.com> Date: Wed, 8 May 2024 07:56:46 -0700 Subject: [PATCH 07/15] proxy: v2.231.0 (#12571) Release notes: https://github.com/linkerd/linkerd2-proxy/releases/tag/release/v2.231.0 Signed-off-by: l5d-bot Co-authored-by: l5d-bot --- .proxy-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.proxy-version b/.proxy-version index f1e97508de450..f1b9ff39c6c87 100644 --- a/.proxy-version +++ b/.proxy-version @@ -1 +1 @@ -v2.230.0 +v2.231.0 From abd9b7bf4cbc9d499e66639ac6082a830723137f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 11:02:22 -0700 Subject: [PATCH 08/15] build(deps): bump softprops/action-gh-release from 2.0.4 to 2.0.5 (#12572) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/9d7c94cfd0a1f3ed45544c887983e9fa900f0564...69320dbe05506a9a39fc8ae11030b214ec2d1f87) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02d0c17439dd9..ac1175b983f97 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -242,7 +242,7 @@ jobs: # mv choco/linkerd.*.nupkg "target/release/linkerd2-cli-stable-$v.nupkg" || true - name: Create release id: create_release - uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 + uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 with: name: "${{ needs.tag.outputs.tag }}" generate_release_notes: true From 1fed61edc945a39612c1c9bc6fec340dbeb0f15d Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Wed, 8 May 2024 11:02:58 -0700 Subject: [PATCH 09/15] Add inbound policy index metrics (#12356) We add index size gauges for each of the resource indexes in the inbound policy index. ``` # HELP inbound_index_meshtls_authentication_index_size The number of MeshTLS authentications in index # TYPE inbound_index_meshtls_authentication_index_size gauge inbound_index_meshtls_authentication_index_size{namespace="linkerd-viz"} 1 # HELP inbound_index_network_autnetication_index_size The number of Network authentications in index # TYPE inbound_index_network_autnetication_index_size gauge inbound_index_network_autnetication_index_size{namespace="linkerd-viz"} 2 # HELP inbound_index_pod_index_size The number of pods in index # TYPE inbound_index_pod_index_size gauge inbound_index_pod_index_size{namespace="linkerd"} 3 inbound_index_pod_index_size{namespace="emojivoto"} 4 inbound_index_pod_index_size{namespace="linkerd-viz"} 5 # HELP inbound_index_external_workload_index_size The number of external workloads in index # TYPE inbound_index_external_workload_index_size gauge inbound_index_external_workload_index_size{namespace="linkerd"} 0 inbound_index_external_workload_index_size{namespace="emojivoto"} 0 inbound_index_external_workload_index_size{namespace="linkerd-viz"} 0 # HELP inbound_index_server_index_size The number of servers in index # TYPE inbound_index_server_index_size gauge inbound_index_server_index_size{namespace="linkerd"} 0 inbound_index_server_index_size{namespace="emojivoto"} 1 inbound_index_server_index_size{namespace="linkerd-viz"} 4 # HELP inbound_index_server_authorization_index_size The number of server authorizations in index # TYPE inbound_index_server_authorization_index_size gauge inbound_index_server_authorization_index_size{namespace="linkerd"} 0 inbound_index_server_authorization_index_size{namespace="emojivoto"} 0 inbound_index_server_authorization_index_size{namespace="linkerd-viz"} 0 # HELP inbound_index_authorization_policy_index_size The number of authorization policies in index # TYPE inbound_index_authorization_policy_index_size gauge inbound_index_authorization_policy_index_size{namespace="linkerd"} 0 inbound_index_authorization_policy_index_size{namespace="emojivoto"} 0 inbound_index_authorization_policy_index_size{namespace="linkerd-viz"} 4 # HELP inbound_index_http_route_index_size The number of HTTP routes in index # TYPE inbound_index_http_route_index_size gauge inbound_index_http_route_index_size{namespace="linkerd"} 0 inbound_index_http_route_index_size{namespace="emojivoto"} 600 inbound_index_http_route_index_size{namespace="linkerd-viz"} 0 ``` Signed-off-by: Alex Leong --- Cargo.lock | 1 + policy-controller/k8s/index/Cargo.toml | 1 + policy-controller/k8s/index/src/inbound.rs | 2 +- .../k8s/index/src/inbound/index.rs | 3 +- .../k8s/index/src/inbound/index/metrics.rs | 129 ++++++++++++++++++ policy-controller/src/main.rs | 41 +++--- 6 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 policy-controller/k8s/index/src/inbound/index/metrics.rs diff --git a/Cargo.lock b/Cargo.lock index e0356667cfe60..21874e746c7f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1266,6 +1266,7 @@ dependencies = [ "linkerd-policy-controller-k8s-api", "maplit", "parking_lot", + "prometheus-client", "thiserror", "tokio", "tokio-stream", diff --git a/policy-controller/k8s/index/Cargo.toml b/policy-controller/k8s/index/Cargo.toml index 8bdb112f11e07..b024213c71c09 100644 --- a/policy-controller/k8s/index/Cargo.toml +++ b/policy-controller/k8s/index/Cargo.toml @@ -20,6 +20,7 @@ kubert = { version = "0.21.2", default-features = false, features = ["index"] } linkerd-policy-controller-core = { path = "../../core" } linkerd-policy-controller-k8s-api = { path = "../api" } parking_lot = "0.12" +prometheus-client = { version = "0.22.0", default-features = false } thiserror = "1" tokio = { version = "1", features = ["macros", "rt", "sync"] } tracing = "0.1" diff --git a/policy-controller/k8s/index/src/inbound.rs b/policy-controller/k8s/index/src/inbound.rs index d2e2c33f6b3cd..8aa0b218af395 100644 --- a/policy-controller/k8s/index/src/inbound.rs +++ b/policy-controller/k8s/index/src/inbound.rs @@ -7,7 +7,7 @@ mod server; pub mod server_authorization; mod workload; -pub use index::{Index, SharedIndex}; +pub use index::{metrics, Index, SharedIndex}; #[cfg(test)] mod tests; diff --git a/policy-controller/k8s/index/src/inbound/index.rs b/policy-controller/k8s/index/src/inbound/index.rs index 2955a90042901..c8a1b47e45d12 100644 --- a/policy-controller/k8s/index/src/inbound/index.rs +++ b/policy-controller/k8s/index/src/inbound/index.rs @@ -37,6 +37,8 @@ use std::{ use tokio::sync::watch; use tracing::info_span; +pub mod metrics; + pub type SharedIndex = Arc>; /// Holds all indexing state. Owned and updated by a single task that processes @@ -1269,7 +1271,6 @@ impl ExternalWorkloadIndex { } } -// impl ExternalWorkload { /// Determines the policies for ports on this workload fn reindex_servers(&mut self, policy: &PolicyIndex, authentications: &AuthenticationNsIndex) { diff --git a/policy-controller/k8s/index/src/inbound/index/metrics.rs b/policy-controller/k8s/index/src/inbound/index/metrics.rs new file mode 100644 index 0000000000000..7ef4b3d264e09 --- /dev/null +++ b/policy-controller/k8s/index/src/inbound/index/metrics.rs @@ -0,0 +1,129 @@ +use prometheus_client::{ + collector::Collector, + encoding::{DescriptorEncoder, EncodeMetric}, + metrics::{gauge::ConstGauge, MetricType}, + registry::Registry, +}; + +use super::SharedIndex; + +#[derive(Debug)] +struct Instrumented(SharedIndex); + +pub fn register(reg: &mut Registry, index: SharedIndex) { + reg.register_collector(Box::new(Instrumented(index))); +} + +impl Collector for Instrumented { + fn encode( + &self, + mut encoder: DescriptorEncoder<'_>, + ) -> std::prelude::v1::Result<(), std::fmt::Error> { + let this = self.0.read(); + + let mut meshtls_authn_encoder = encoder.encode_descriptor( + "meshtls_authentication_index_size", + "The number of MeshTLS authentications in index", + None, + MetricType::Gauge, + )?; + for (ns, auth) in &this.authentications.by_ns { + let labels = [("namespace", ns.as_str())]; + let meshtls_authn = ConstGauge::new(auth.meshtls.len() as u32); + let meshtls_authn_encoder = meshtls_authn_encoder.encode_family(&labels)?; + meshtls_authn.encode(meshtls_authn_encoder)?; + } + + let mut network_authn_encoder = encoder.encode_descriptor( + "network_authentication_index_size", + "The number of Network authentications in index", + None, + MetricType::Gauge, + )?; + for (ns, auth) in &this.authentications.by_ns { + let labels = [("namespace", ns.as_str())]; + let network_authn = ConstGauge::new(auth.network.len() as u32); + let network_authn_encoder = network_authn_encoder.encode_family(&labels)?; + network_authn.encode(network_authn_encoder)?; + } + + let mut pods_encoder = encoder.encode_descriptor( + "pod_index_size", + "The number of pods in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let pods = ConstGauge::new(index.pods.by_name.len() as u32); + let pods_encoder = pods_encoder.encode_family(&labels)?; + pods.encode(pods_encoder)?; + } + + let mut external_workloads_encoder = encoder.encode_descriptor( + "external_workload_index_size", + "The number of external workloads in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let external_workloads = ConstGauge::new(index.external_workloads.by_name.len() as u32); + let external_workloads_encoder = external_workloads_encoder.encode_family(&labels)?; + external_workloads.encode(external_workloads_encoder)?; + } + + let mut servers_encoder = encoder.encode_descriptor( + "server_index_size", + "The number of servers in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let servers = ConstGauge::new(index.policy.servers.len() as u32); + let servers_encoder = servers_encoder.encode_family(&labels)?; + servers.encode(servers_encoder)?; + } + + let mut server_authz_encoder = encoder.encode_descriptor( + "server_authorization_index_size", + "The number of server authorizations in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let server_authz = ConstGauge::new(index.policy.server_authorizations.len() as u32); + let server_authz_encoder = server_authz_encoder.encode_family(&labels)?; + server_authz.encode(server_authz_encoder)?; + } + + let mut authz_policies_encoder = encoder.encode_descriptor( + "authorization_policy_index_size", + "The number of authorization policies in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let authz_policies = ConstGauge::new(index.policy.authorization_policies.len() as u32); + let authz_policies_encoder = authz_policies_encoder.encode_family(&labels)?; + authz_policies.encode(authz_policies_encoder)?; + } + + let mut http_routes_encoder = encoder.encode_descriptor( + "http_route_index_size", + "The number of HTTP routes in index", + None, + MetricType::Gauge, + )?; + for (ns, index) in &this.namespaces.by_ns { + let labels = [("namespace", ns.as_str())]; + let http_routes = ConstGauge::new(index.policy.http_routes.len() as u32); + let http_routes_encoder = http_routes_encoder.encode_family(&labels)?; + http_routes.encode(http_routes_encoder)?; + } + Ok(()) + } +} diff --git a/policy-controller/src/main.rs b/policy-controller/src/main.rs index 20d22bfa0bce1..ced70ce5b3310 100644 --- a/policy-controller/src/main.rs +++ b/policy-controller/src/main.rs @@ -125,19 +125,6 @@ async fn main() -> Result<()> { Some(server) }; - let mut prom = ::default(); - let resource_status = prom.sub_registry_with_prefix("resource_status"); - let status_metrics = status::ControllerMetrics::register(resource_status); - let status_index_metrcs = status::IndexMetrics::register(resource_status); - - let mut runtime = kubert::Runtime::builder() - .with_log(log_level, log_format) - .with_admin(admin.into_builder().with_prometheus(prom)) - .with_client(client) - .with_optional_server(server) - .build() - .await?; - let probe_networks = probe_networks.map(|IpNets(nets)| nets).unwrap_or_default(); let default_opaque_ports = parse_portset(&default_opaque_ports)?; @@ -152,6 +139,29 @@ async fn main() -> Result<()> { probe_networks, }); + // Build the API index data structures which will maintain information + // necessary for serving the inbound policy and outbound policy gRPC APIs. + let inbound_index = inbound::Index::shared(cluster_info.clone()); + let outbound_index = outbound::Index::shared(cluster_info); + + let mut prom = ::default(); + let resource_status = prom.sub_registry_with_prefix("resource_status"); + let status_metrics = status::ControllerMetrics::register(resource_status); + let status_index_metrcs = status::IndexMetrics::register(resource_status); + + inbound::metrics::register( + prom.sub_registry_with_prefix("inbound_index"), + inbound_index.clone(), + ); + + let mut runtime = kubert::Runtime::builder() + .with_log(log_level, log_format) + .with_admin(admin.into_builder().with_prometheus(prom)) + .with_client(client) + .with_optional_server(server) + .build() + .await?; + let hostname = std::env::var("HOSTNAME").expect("Failed to fetch `HOSTNAME` environment variable"); let params = kubert::lease::ClaimParams { @@ -167,11 +177,6 @@ async fn main() -> Result<()> { .await?; let (claims, _task) = lease.spawn(hostname.clone(), params).await?; - // Build the API index data structures which will maintain information - // necessary for serving the inbound policy and outbound policy gRPC APIs. - let inbound_index = inbound::Index::shared(cluster_info.clone()); - let outbound_index = outbound::Index::shared(cluster_info); - // Build the status index which will maintain information necessary for // updating the status field of policy resources. let (updates_tx, updates_rx) = mpsc::channel(STATUS_UPDATE_QUEUE_SIZE); From 7dbafb26c8f3ff0a5823849198d0767da18c6aa9 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Thu, 9 May 2024 09:09:26 -0500 Subject: [PATCH 10/15] Make IPv6 support opt-in (#12576) This changes the default of the Helm value `disableIPv6` to `true`. Additionally, the proxy's `LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS` env var is now set accordingly to that value. This addresses an incompatibility with GKE introduced in last week's edge (`edge-24.5.1`): in default IPv4-only nodes in GKE clusters the proxy can't bind to `::1`, so we have make IPv6 opt-in to avoid surprises. --- charts/linkerd-control-plane/values.yaml | 2 +- charts/partials/templates/_proxy.tpl | 2 +- .../inject-filepath/expected/injected_nginx.yaml | 3 ++- .../expected/injected_nginx_redis.yaml | 6 ++++-- .../inject-filepath/expected/injected_redis.yaml | 3 ++- cli/cmd/testdata/inject_contour.golden.yml | 3 ++- .../inject_emojivoto_already_injected.golden.yml | 12 ++++++++---- .../testdata/inject_emojivoto_deployment.golden.yml | 3 ++- ...nject_emojivoto_deployment_access_log.golden.yml | 3 ++- ...nt_automountServiceAccountToken_false.golden.yml | 3 ++- ...ect_emojivoto_deployment_capabilities.golden.yml | 3 ++- ...emojivoto_deployment_config_overrides.golden.yml | 3 ++- ..._emojivoto_deployment_controller_name.golden.yml | 6 ++++-- .../inject_emojivoto_deployment_debug.golden.yml | 3 ++- ..._emojivoto_deployment_empty_resources.golden.yml | 3 ++- ...mojivoto_deployment_hostNetwork_false.golden.yml | 3 ++- ...t_emojivoto_deployment_native_sidecar.golden.yml | 3 ++- ...mojivoto_deployment_no_init_container.golden.yml | 2 +- ...ect_emojivoto_deployment_opaque_ports.golden.yml | 3 ++- ...nject_emojivoto_deployment_overridden.golden.yml | 3 ++- .../inject_emojivoto_deployment_params.golden.yml | 3 ++- ...ect_emojivoto_deployment_proxyignores.golden.yml | 3 ++- .../inject_emojivoto_deployment_udp.golden.yml | 3 ++- cli/cmd/testdata/inject_emojivoto_list.golden.yml | 6 ++++-- ...inject_emojivoto_list_empty_resources.golden.yml | 6 ++++-- cli/cmd/testdata/inject_emojivoto_pod.golden.yml | 3 ++- .../inject_emojivoto_pod_ingress.golden.yml | 3 ++- .../inject_emojivoto_pod_proxyignores.golden.yml | 3 ++- .../inject_emojivoto_pod_with_requests.golden.yml | 3 ++- .../inject_emojivoto_statefulset.golden.yml | 3 ++- .../inject_gettest_deployment.good.golden.yml | 6 ++++-- .../testdata/inject_tap_deployment_debug.golden.yml | 3 ++- .../install_controlplane_tracing_output.golden | 13 ++++++++----- cli/cmd/testdata/install_custom_domain.golden | 13 ++++++++----- cli/cmd/testdata/install_custom_registry.golden | 13 ++++++++----- cli/cmd/testdata/install_default.golden | 13 ++++++++----- .../install_default_override_dst_get_nets.golden | 13 ++++++++----- cli/cmd/testdata/install_default_token.golden | 13 ++++++++----- cli/cmd/testdata/install_ha_output.golden | 13 ++++++++----- .../install_ha_with_overrides_output.golden | 13 ++++++++----- .../install_heartbeat_disabled_output.golden | 13 ++++++++----- .../install_helm_control_plane_output.golden | 13 ++++++++----- .../install_helm_control_plane_output_ha.golden | 13 ++++++++----- .../testdata/install_helm_output_ha_labels.golden | 13 ++++++++----- ...install_helm_output_ha_namespace_selector.golden | 13 ++++++++----- cli/cmd/testdata/install_no_init_container.golden | 10 +++++----- cli/cmd/testdata/install_output.golden | 2 +- cli/cmd/testdata/install_proxy_ignores.golden | 13 ++++++++----- cli/cmd/testdata/install_values_file.golden | 13 ++++++++----- .../fake/data/pod-with-debug.patch.json | 3 ++- .../fake/data/pod-with-ns-annotations.patch.json | 3 ++- controller/proxy-injector/fake/data/pod.patch.json | 3 ++- pkg/charts/linkerd2/values_test.go | 2 +- test/integration/deep/norelay/norelay_test.go | 8 ++++++++ test/integration/install/inject/inject_test.go | 1 + testutil/inject_validator.go | 2 +- 56 files changed, 220 insertions(+), 126 deletions(-) diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index e8705bfeca390..8be2b083e1a11 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -44,7 +44,7 @@ enablePodDisruptionBudget: false # -- disables routing IPv6 traffic in addition to IPv4 traffic through the # proxy (IPv6 routing only available as of proxy-init v2.3.0 and linkerd-cni # v1.4.0) -disableIPv6: false +disableIPv6: true controller: # -- sets pod disruption budget parameter for all deployments diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index 3699e2a179aa6..cfb8c9f79db09 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -83,7 +83,7 @@ env: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:{{.Values.proxy.ports.outbound}}" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:{{.Values.proxy.ports.outbound}},[::1]:{{.Values.proxy.ports.outbound}}" + value: "127.0.0.1:{{.Values.proxy.ports.outbound}}{{ if not .Values.disableIPv6}},[::1]:{{.Values.proxy.ports.outbound}}{{ end }}" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:{{.Values.proxy.ports.inbound}}" - name: LINKERD2_PROXY_INBOUND_IPS diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index c40bbf9c9f368..252fa92121586 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -70,7 +70,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -181,6 +181,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml index 5fa0ce5c26450..e2bd8531c5e0c 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -70,7 +70,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -181,6 +181,7 @@ spec: name: server initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -303,7 +304,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -414,6 +415,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index a6edda66a2746..3c3887c962a6c 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -70,7 +70,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -181,6 +181,7 @@ spec: name: server initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 337dbe6936f57..e6ae569244d11 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -78,7 +78,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -221,6 +221,7 @@ spec: - mountPath: /config name: contour-config - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index 75fc456b2f00a..488b4a3feb5ff 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -192,6 +192,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -316,7 +317,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -436,6 +437,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -560,7 +562,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -680,6 +682,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -804,7 +807,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -924,6 +927,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 204bfe8bba235..e9a2868b09006 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -192,6 +192,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index 1db8a08a1e363..ee1b8c52c7dcd 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -195,6 +195,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index c493d21e6bf73..0eb226727f1e6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -184,6 +184,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index 50b828cdd4f51..15b73a3f0e2ec 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -205,6 +205,7 @@ spec: runAsUser: 33 initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml index 40dcfe997bd3e..9d75d98fbacee 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -82,7 +82,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -209,6 +209,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml index 10eec0d806b64..b3615fb0c3783 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -192,6 +192,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -316,7 +317,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -436,6 +437,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index 2922090493551..0bd895fa0a8a2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -205,6 +205,7 @@ spec: terminationMessagePolicy: FallbackToLogsOnError initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml index 5152ed61ecd4b..dcafc7d3fa1e9 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -192,6 +192,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml index 2a06c1af696b6..9bd326fb12b75 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -193,6 +193,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index 08b4fa500ceea..cb947e5641212 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -38,6 +38,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -125,7 +126,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml index d38d02b39de02..68552f6a9b62e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index fbd85a5e25942..aaff426040647 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -193,6 +193,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index df20a48ac1d1d..d86feff963dc3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -193,6 +193,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index cfd442c2d8261..9dda1941ae30f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -192,6 +192,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index c8f47cda80d70..c9ca7408c6624 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -74,7 +74,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -194,6 +194,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index f80a1a45965e7..f5caa8ce62b79 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -72,7 +72,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -194,6 +194,7 @@ spec: protocol: UDP initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 75ba9360c12d0..34c6a37127cc2 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -74,7 +74,7 @@ items: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -194,6 +194,7 @@ items: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -317,7 +318,7 @@ items: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -432,6 +433,7 @@ items: protocol: TCP initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml index b5e3be0d72de8..269a38298ff22 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -74,7 +74,7 @@ items: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -194,6 +194,7 @@ items: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -317,7 +318,7 @@ items: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -432,6 +433,7 @@ items: protocol: TCP initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 92b337576dd14..efe4eb6e6f37a 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -64,7 +64,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -176,6 +176,7 @@ spec: name: vote-bot initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 4a414122726e4..657aeeef9b332 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -65,7 +65,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -179,6 +179,7 @@ spec: name: vote-bot initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 80a1b7e1594ac..1af9579f2767c 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -66,7 +66,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -178,6 +178,7 @@ spec: name: vote-bot initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml index 06ab98f476a94..b2f56e47cd1fc 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -68,7 +68,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -187,6 +187,7 @@ spec: name: vote-bot initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 784cac25a87b9..e6d702f724f29 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -73,7 +73,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -193,6 +193,7 @@ spec: name: http initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index fdb03e6073ec4..3a0e3519d70b0 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -68,7 +68,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -194,6 +194,7 @@ spec: - containerPort: 9090 initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -314,7 +315,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -440,6 +441,7 @@ spec: - containerPort: 9090 initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index c3e133d2f5dd8..0a869103ff1a9 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -89,7 +89,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: 127.0.0.1:4140 - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: 127.0.0.1:4140,[::1]:4140 + value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: '[::]:4143' - name: LINKERD2_PROXY_INBOUND_IPS @@ -254,6 +254,7 @@ spec: dnsPolicy: ClusterFirst initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 3491927a30aa6..0a74ff8f03945 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1019,7 +1019,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1113,6 +1113,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1366,7 +1367,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1476,7 +1477,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} - -trace-collector=collector.linkerd-jaeger.svc.cluster.local:55678 @@ -1597,6 +1598,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1815,7 +1817,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1958,6 +1960,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 1554d1ae3810a..27e2e36eb93de 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index e23b71d843983..bccf61a860a30 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: my.custom.registry/linkerd-io/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 1554d1ae3810a..27e2e36eb93de 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index e2565a2a019ab..e47567ef691ed 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index fe1138bed2541..dc986277d0fb4 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1110,6 +1110,7 @@ spec: name: linkerd-identity-end-entity initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1356,7 +1357,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1464,7 +1465,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1584,6 +1585,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1795,7 +1797,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1936,6 +1938,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 2e5eb9d4871ff..e252cc40248ed 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -534,7 +534,7 @@ data: limit: 250Mi request: 50Mi disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: true @@ -1095,7 +1095,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1194,6 +1194,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1482,7 +1483,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1597,7 +1598,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1723,6 +1724,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1966,7 +1968,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -2120,6 +2122,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 2ff16790de4c5..98f1ad5656a91 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -534,7 +534,7 @@ data: limit: 250Mi request: 50Mi disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: true @@ -1095,7 +1095,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1194,6 +1194,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1482,7 +1483,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1597,7 +1598,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1723,6 +1724,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1966,7 +1968,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -2120,6 +2122,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index e1eb7409edece..d32f4a02a7e22 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -456,7 +456,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: true - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -949,7 +949,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1043,6 +1043,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1296,7 +1297,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1406,7 +1407,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1526,6 +1527,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1684,7 +1686,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1827,6 +1829,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 923039b72c643..2b1f498a847e1 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -526,7 +526,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -991,7 +991,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1085,6 +1085,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1340,7 +1341,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1450,7 +1451,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=test.trust.domain - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:linkerd-version @@ -1570,6 +1571,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1792,7 +1794,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1935,6 +1937,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index 59c93ac127b56..82c88d51fd5ad 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -535,7 +535,7 @@ data: limit: 250Mi request: 50Mi disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: true @@ -1068,7 +1068,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1167,6 +1167,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1457,7 +1458,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1572,7 +1573,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=test.trust.domain - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:linkerd-version @@ -1698,6 +1699,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1945,7 +1947,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -2099,6 +2101,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 499f31d6d2be1..f8e374f1bef66 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -535,7 +535,7 @@ data: limit: 250Mi request: 50Mi disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: true @@ -1076,7 +1076,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1175,6 +1175,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1469,7 +1470,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1584,7 +1585,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=test.trust.domain - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:linkerd-version @@ -1710,6 +1711,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1965,7 +1967,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -2119,6 +2121,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index 9a21dad6c178c..251a4bb65dc1c 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -530,7 +530,7 @@ data: limit: 250Mi request: 50Mi disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: true @@ -1058,7 +1058,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1157,6 +1157,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1447,7 +1448,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1562,7 +1563,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=test.trust.domain - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:linkerd-version @@ -1688,6 +1689,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1935,7 +1937,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -2089,6 +2091,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 79644bcd99035..dbf7b7ad7f06d 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1359,7 +1359,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1469,7 +1469,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1801,7 +1801,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 87ae7fed24497..19345192ce65d 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -1967,7 +1967,7 @@ spec: --- apiVersion: v1 data: - linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJJbWFnZTogQ29udHJvbGxlckltYWdlCmNvbnRyb2xsZXJMb2dGb3JtYXQ6IENvbnRyb2xsZXJMb2dGb3JtYXQKY29udHJvbGxlckxvZ0xldmVsOiBDb250cm9sbGVyTG9nTGV2ZWwKZGVidWdDb250YWluZXI6CiAgaW1hZ2U6CiAgICBuYW1lOiBEZWJ1Z0ltYWdlTmFtZQogICAgcHVsbFBvbGljeTogRGVidWdJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IERlYnVnVmVyc2lvbgpkZXN0aW5hdGlvbkNvbnRyb2xsZXI6IG51bGwKZW5hYmxlRW5kcG9pbnRTbGljZXM6IGZhbHNlCmhlYXJ0YmVhdFNjaGVkdWxlOiAxIDIgMyA0IDUKaWRlbnRpdHk6CiAgaXNzdWVyOgogICAgdGxzOgogICAgICBjcnRQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICAgICAgICBNSUlCd0RDQ0FXZWdBd0lCQWdJUkFKUklnWjhSdE84RXdnMVhlcGY4VDQ0d0NnWUlLb1pJemowRUF3SXdLVEVuCiAgICAgICAgTUNVR0ExVUVBeE1lYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01CNFhEVEl3TURneQogICAgICAgIE9EQTNNVE0wTjFvWERUTXdNRGd5TmpBM01UTTBOMW93S1RFbk1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHUKICAgICAgICBhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNRmt3RXdZSEtvWkl6ajBDQVFZSUtvWkl6ajBEQVFjRFFnQUUxL0ZwCiAgICAgICAgZmNSbkRjZWRMNkFqVWFYWVB2NERJTUJhSnVmT0k1Tld0eStYU1g3SmpYZ1p0TTcyZFF2UmFZYW51eEQzNkR0MQogICAgICAgIDIvSnh5aVNneEtXUmRvYXkrYU53TUc0d0RnWURWUjBQQVFIL0JBUURBZ0VHTUJJR0ExVWRFd0VCL3dRSU1BWUIKICAgICAgICBBZjhDQVFBd0hRWURWUjBPQkJZRUZJMVducnFNWUthSEhPbyt6cHlpaURxMnBPMEtNQ2tHQTFVZEVRUWlNQ0NDCiAgICAgICAgSG1sa1pXNTBhWFI1TG14cGJtdGxjbVF1WTJ4MWMzUmxjaTVzYjJOaGJEQUtCZ2dxaGtqT1BRUURBZ05IQURCRQogICAgICAgIEFpQXR1b0k1WHVDdHJHVlJ6U21SVGwycmEyOGFWOU15VFU3ZDVxblRBRkhLU2dJZ1JLQ3ZsdU9TZ0E1TzIxcDUKICAgICAgICA1MXRkcm1rSEVaUnIwcWxMU0pkSFlnRWZNems9CiAgICAgICAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQogICAgICBrZXlQRU06IHwKICAgICAgICAtLS0tLUJFR0lOIEVDIFBSSVZBVEUgS0VZLS0tLS0KICAgICAgICBNSGNDQVFFRUlBQWU4bmZielp1OWMvT0IyKzh4Sk0wRno3TlV3VFFhenVsa0ZOczRUSTUrb0FvR0NDcUdTTTQ5CiAgICAgICAgQXdFSG9VUURRZ0FFMS9GcGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MgogICAgICAgIGRRdlJhWWFudXhEMzZEdDEyL0p4eWlTZ3hLV1Jkb2F5K1E9PQogICAgICAgIC0tLS0tRU5EIEVDIFBSSVZBVEUgS0VZLS0tLS0KaWRlbnRpdHlUcnVzdEFuY2hvcnNQRU06IHwKICAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KICBNSUlCd1RDQ0FXYWdBd0lCQWdJUWVEWnA1bERhSXlnUTVVZk1LWnJGQVRBS0JnZ3Foa2pPUFFRREFqQXBNU2N3CiAgSlFZRFZRUURFeDVwWkdWdWRHbDBlUzVzYVc1clpYSmtMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3T0RJNAogIE1EY3hNalEzV2hjTk16QXdPREkyTURjeE1qUTNXakFwTVNjd0pRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXIKICBaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUnFjNzBaCiAgbDF2Z3c3OXJqQjV1U0lUSUNVQTZHeWZ2U0ZmY3VJaXM3Qi9YRlNra3dBSFU1Uy9zMUFBUCtSMFRYN0hCV1VDNAogIHVhRzRXV3Npd0pLTm43bWdvM0F3YmpBT0JnTlZIUThCQWY4RUJBTUNBUVl3RWdZRFZSMFRBUUgvQkFnd0JnRUIKICAvd0lCQVRBZEJnTlZIUTRFRmdRVTVZdGpWVlBmZDdJN05MSHNuMkMyNkVCeUdWMHdLUVlEVlIwUkJDSXdJSUllCiAgYVdSbGJuUnBkSGt1YkdsdWEyVnlaQzVqYkhWemRHVnlMbXh2WTJGc01Bb0dDQ3FHU000OUJBTUNBMGtBTUVZQwogIElRQ043bEJGTEREdmp4NlYwK1hranBLRVJSc0pZZjVhZE12bmxvRmw0OGlsSmdJaEFOdHhobmRjcitRSlB1QzgKICB2Z1VDMGQyLzlGTXVlSVZNYis0NldUQ09qc3FyCiAgLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQppbWFnZVB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQppbWFnZVB1bGxTZWNyZXRzOiBudWxsCmxpbmtlcmRWZXJzaW9uOiBMaW5rZXJkVmVyc2lvbgpuZXR3b3JrVmFsaWRhdG9yOgogIGVuYWJsZVNlY3VyaXR5Q29udGV4dDogZmFsc2UKcG9kTW9uaXRvcjogbnVsbApwb2xpY3lDb250cm9sbGVyOgogIGltYWdlOgogICAgbmFtZTogUG9saWN5Q29udHJvbGxlckltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQb2xpY3lDb250cm9sbGVyVmVyc2lvbgogIGxvZ0xldmVsOiBsb2ctbGV2ZWwKICByZXNvdXJjZXM6CiAgICBjcHU6CiAgICAgIGxpbWl0OiBjcHUtbGltaXQKICAgICAgcmVxdWVzdDogY3B1LXJlcXVlc3QKICAgIG1lbW9yeToKICAgICAgbGltaXQ6IG1lbW9yeS1saW1pdAogICAgICByZXF1ZXN0OiBtZW1vcnktcmVxdWVzdApwb2xpY3lWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHBvbGljeSB2YWxpZGF0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKcHJpb3JpdHlDbGFzc05hbWU6IFByaW9yaXR5Q2xhc3NOYW1lCnByb2ZpbGVWYWxpZGF0b3I6CiAgY2FCdW5kbGU6IHByb2ZpbGUgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByb3h5OgogIGNvbnRyb2w6IG51bGwKICBkZWZhdWx0SW5ib3VuZFBvbGljeTogZGVmYXVsdC1hbGxvdy1wb2xpY3kKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5VmVyc2lvbgogIGluYm91bmRDb25uZWN0VGltZW91dDogIiIKICBpbmJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIGxvZ0xldmVsOiB3YXJuLGxpbmtlcmQ9aW5mbwogIG9wYXF1ZVBvcnRzOiAyNSw0NDMsNTg3LDMzMDYsNTQzMiwxMTIxMQogIG91dGJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgb3V0Ym91bmREaXNjb3ZlcnlDYWNoZVVudXNlZFRpbWVvdXQ6ICIiCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogY3B1LWxpbWl0CiAgICAgIHJlcXVlc3Q6IGNwdS1yZXF1ZXN0CiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiBtZW1vcnktbGltaXQKICAgICAgcmVxdWVzdDogbWVtb3J5LXJlcXVlc3QKICBzdGFydHVwUHJvYmU6IG51bGwKcHJveHlDb250YWluZXJOYW1lOiBQcm94eUNvbnRhaW5lck5hbWUKcHJveHlJbml0OgogIGlnbm9yZUluYm91bmRQb3J0czogIiIKICBpZ25vcmVPdXRib3VuZFBvcnRzOiAiNDQzIgogIGltYWdlOgogICAgbmFtZTogUHJveHlJbml0SW1hZ2VOYW1lCiAgICBwdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IFByb3h5SW5pdFZlcnNpb24KICBrdWJlQVBJU2VydmVyUG9ydHM6ICIiCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICByZXF1ZXN0OiAxMG0KICAgIG1lbW9yeToKICAgICAgbGltaXQ6IDUwTWkKICAgICAgcmVxdWVzdDogMTBNaQpwcm94eUluamVjdG9yOgogIGNhQnVuZGxlOiBwcm94eSBpbmplY3RvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQp3ZWJob29rRmFpbHVyZVBvbGljeTogV2ViaG9va0ZhaWx1cmVQb2xpY3kK + linkerd-config-overrides: Y2xpVmVyc2lvbjogQ2xpVmVyc2lvbgpjbHVzdGVyTmV0d29ya3M6IENsdXN0ZXJOZXR3b3Jrcwpjb250cm9sUGxhbmVUcmFjaW5nTmFtZXNwYWNlOiAiIgpjb250cm9sbGVyOiBudWxsCmNvbnRyb2xsZXJJbWFnZTogQ29udHJvbGxlckltYWdlCmNvbnRyb2xsZXJMb2dGb3JtYXQ6IENvbnRyb2xsZXJMb2dGb3JtYXQKY29udHJvbGxlckxvZ0xldmVsOiBDb250cm9sbGVyTG9nTGV2ZWwKZGVidWdDb250YWluZXI6CiAgaW1hZ2U6CiAgICBuYW1lOiBEZWJ1Z0ltYWdlTmFtZQogICAgcHVsbFBvbGljeTogRGVidWdJbWFnZVB1bGxQb2xpY3kKICAgIHZlcnNpb246IERlYnVnVmVyc2lvbgpkZXN0aW5hdGlvbkNvbnRyb2xsZXI6IG51bGwKZGlzYWJsZUlQdjY6IGZhbHNlCmVuYWJsZUVuZHBvaW50U2xpY2VzOiBmYWxzZQpoZWFydGJlYXRTY2hlZHVsZTogMSAyIDMgNCA1CmlkZW50aXR5OgogIGlzc3VlcjoKICAgIHRsczoKICAgICAgY3J0UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgICAgICAgTUlJQndEQ0NBV2VnQXdJQkFnSVJBSlJJZ1o4UnRPOEV3ZzFYZXBmOFQ0NHdDZ1lJS29aSXpqMEVBd0l3S1RFbgogICAgICAgIE1DVUdBMVVFQXhNZWFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQjRYRFRJd01EZ3kKICAgICAgICBPREEzTVRNME4xb1hEVE13TURneU5qQTNNVE0wTjFvd0tURW5NQ1VHQTFVRUF4TWVhV1JsYm5ScGRIa3ViR2x1CiAgICAgICAgYTJWeVpDNWpiSFZ6ZEdWeUxteHZZMkZzTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMS9GcAogICAgICAgIGZjUm5EY2VkTDZBalVhWFlQdjRESU1CYUp1Zk9JNU5XdHkrWFNYN0pqWGdadE03MmRRdlJhWWFudXhEMzZEdDEKICAgICAgICAyL0p4eWlTZ3hLV1Jkb2F5K2FOd01HNHdEZ1lEVlIwUEFRSC9CQVFEQWdFR01CSUdBMVVkRXdFQi93UUlNQVlCCiAgICAgICAgQWY4Q0FRQXdIUVlEVlIwT0JCWUVGSTFXbnJxTVlLYUhIT28renB5aWlEcTJwTzBLTUNrR0ExVWRFUVFpTUNDQwogICAgICAgIEhtbGtaVzUwYVhSNUxteHBibXRsY21RdVkyeDFjM1JsY2k1c2IyTmhiREFLQmdncWhrak9QUVFEQWdOSEFEQkUKICAgICAgICBBaUF0dW9JNVh1Q3RyR1ZSelNtUlRsMnJhMjhhVjlNeVRVN2Q1cW5UQUZIS1NnSWdSS0N2bHVPU2dBNU8yMXA1CiAgICAgICAgNTF0ZHJta0hFWlJyMHFsTFNKZEhZZ0VmTXprPQogICAgICAgIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KICAgICAga2V5UEVNOiB8CiAgICAgICAgLS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCiAgICAgICAgTUhjQ0FRRUVJQUFlOG5mYnpadTljL09CMis4eEpNMEZ6N05Vd1RRYXp1bGtGTnM0VEk1K29Bb0dDQ3FHU000OQogICAgICAgIEF3RUhvVVFEUWdBRTEvRnBmY1JuRGNlZEw2QWpVYVhZUHY0RElNQmFKdWZPSTVOV3R5K1hTWDdKalhnWnRNNzIKICAgICAgICBkUXZSYVlhbnV4RDM2RHQxMi9KeHlpU2d4S1dSZG9heStRPT0KICAgICAgICAtLS0tLUVORCBFQyBQUklWQVRFIEtFWS0tLS0tCmlkZW50aXR5VHJ1c3RBbmNob3JzUEVNOiB8CiAgLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCiAgTUlJQndUQ0NBV2FnQXdJQkFnSVFlRFpwNWxEYUl5Z1E1VWZNS1pyRkFUQUtCZ2dxaGtqT1BRUURBakFwTVNjdwogIEpRWURWUVFERXg1cFpHVnVkR2wwZVM1c2FXNXJaWEprTG1Oc2RYTjBaWEl1Ykc5allXd3dIaGNOTWpBd09ESTQKICBNRGN4TWpRM1doY05NekF3T0RJMk1EY3hNalEzV2pBcE1TY3dKUVlEVlFRREV4NXBaR1Z1ZEdsMGVTNXNhVzVyCiAgWlhKa0xtTnNkWE4wWlhJdWJHOWpZV3d3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJxYzcwWgogIGwxdmd3NzlyakI1dVNJVElDVUE2R3lmdlNGZmN1SWlzN0IvWEZTa2t3QUhVNVMvczFBQVArUjBUWDdIQldVQzQKICB1YUc0V1dzaXdKS05uN21nbzNBd2JqQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCCiAgL3dJQkFUQWRCZ05WSFE0RUZnUVU1WXRqVlZQZmQ3STdOTEhzbjJDMjZFQnlHVjB3S1FZRFZSMFJCQ0l3SUlJZQogIGFXUmxiblJwZEhrdWJHbHVhMlZ5WkM1amJIVnpkR1Z5TG14dlkyRnNNQW9HQ0NxR1NNNDlCQU1DQTBrQU1FWUMKICBJUUNON2xCRkxERHZqeDZWMCtYa2pwS0VSUnNKWWY1YWRNdm5sb0ZsNDhpbEpnSWhBTnR4aG5kY3IrUUpQdUM4CiAgdmdVQzBkMi85Rk11ZUlWTWIrNDZXVENPanNxcgogIC0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KaW1hZ2VQdWxsUG9saWN5OiBJbWFnZVB1bGxQb2xpY3kKaW1hZ2VQdWxsU2VjcmV0czogbnVsbApsaW5rZXJkVmVyc2lvbjogTGlua2VyZFZlcnNpb24KbmV0d29ya1ZhbGlkYXRvcjoKICBlbmFibGVTZWN1cml0eUNvbnRleHQ6IGZhbHNlCnBvZE1vbml0b3I6IG51bGwKcG9saWN5Q29udHJvbGxlcjoKICBpbWFnZToKICAgIG5hbWU6IFBvbGljeUNvbnRyb2xsZXJJbWFnZU5hbWUKICAgIHB1bGxQb2xpY3k6IEltYWdlUHVsbFBvbGljeQogICAgdmVyc2lvbjogUG9saWN5Q29udHJvbGxlclZlcnNpb24KICBsb2dMZXZlbDogbG9nLWxldmVsCiAgcmVzb3VyY2VzOgogICAgY3B1OgogICAgICBsaW1pdDogY3B1LWxpbWl0CiAgICAgIHJlcXVlc3Q6IGNwdS1yZXF1ZXN0CiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiBtZW1vcnktbGltaXQKICAgICAgcmVxdWVzdDogbWVtb3J5LXJlcXVlc3QKcG9saWN5VmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwb2xpY3kgdmFsaWRhdG9yIENBIGJ1bmRsZQogIGV4dGVybmFsU2VjcmV0OiB0cnVlCnByaW9yaXR5Q2xhc3NOYW1lOiBQcmlvcml0eUNsYXNzTmFtZQpwcm9maWxlVmFsaWRhdG9yOgogIGNhQnVuZGxlOiBwcm9maWxlIHZhbGlkYXRvciBDQSBidW5kbGUKICBleHRlcm5hbFNlY3JldDogdHJ1ZQpwcm94eToKICBjb250cm9sOiBudWxsCiAgZGVmYXVsdEluYm91bmRQb2xpY3k6IGRlZmF1bHQtYWxsb3ctcG9saWN5CiAgaW1hZ2U6CiAgICBuYW1lOiBQcm94eUltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQcm94eVZlcnNpb24KICBpbmJvdW5kQ29ubmVjdFRpbWVvdXQ6ICIiCiAgaW5ib3VuZERpc2NvdmVyeUNhY2hlVW51c2VkVGltZW91dDogIiIKICBsb2dMZXZlbDogd2FybixsaW5rZXJkPWluZm8KICBvcGFxdWVQb3J0czogMjUsNDQzLDU4NywzMzA2LDU0MzIsMTEyMTEKICBvdXRib3VuZENvbm5lY3RUaW1lb3V0OiAiIgogIG91dGJvdW5kRGlzY292ZXJ5Q2FjaGVVbnVzZWRUaW1lb3V0OiAiIgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgbGltaXQ6IGNwdS1saW1pdAogICAgICByZXF1ZXN0OiBjcHUtcmVxdWVzdAogICAgbWVtb3J5OgogICAgICBsaW1pdDogbWVtb3J5LWxpbWl0CiAgICAgIHJlcXVlc3Q6IG1lbW9yeS1yZXF1ZXN0CiAgc3RhcnR1cFByb2JlOiBudWxsCnByb3h5Q29udGFpbmVyTmFtZTogUHJveHlDb250YWluZXJOYW1lCnByb3h5SW5pdDoKICBpZ25vcmVJbmJvdW5kUG9ydHM6ICIiCiAgaWdub3JlT3V0Ym91bmRQb3J0czogIjQ0MyIKICBpbWFnZToKICAgIG5hbWU6IFByb3h5SW5pdEltYWdlTmFtZQogICAgcHVsbFBvbGljeTogSW1hZ2VQdWxsUG9saWN5CiAgICB2ZXJzaW9uOiBQcm94eUluaXRWZXJzaW9uCiAga3ViZUFQSVNlcnZlclBvcnRzOiAiIgogIHJlc291cmNlczoKICAgIGNwdToKICAgICAgcmVxdWVzdDogMTBtCiAgICBtZW1vcnk6CiAgICAgIGxpbWl0OiA1ME1pCiAgICAgIHJlcXVlc3Q6IDEwTWkKcHJveHlJbmplY3RvcjoKICBjYUJ1bmRsZTogcHJveHkgaW5qZWN0b3IgQ0EgYnVuZGxlCiAgZXh0ZXJuYWxTZWNyZXQ6IHRydWUKd2ViaG9va0ZhaWx1cmVQb2xpY3k6IFdlYmhvb2tGYWlsdXJlUG9saWN5Cg== kind: Secret metadata: creationTimestamp: null diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index e1336c069f073..f512607affa2f 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=cluster.local - -identity-trust-domain=cluster.local - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index bc703722a29a2..5061757bef524 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -525,7 +525,7 @@ data: destinationProxyResources: null destinationResources: null disableHeartBeat: false - disableIPv6: false + disableIPv6: true enableEndpointSlices: true enableH2Upgrade: true enablePodAntiAffinity: false @@ -1018,7 +1018,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1112,6 +1112,7 @@ spec: name: linkerd-identity-token initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1365,7 +1366,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1475,7 +1476,7 @@ spec: - -cluster-domain=example.com - -identity-trust-domain=example.com - -default-opaque-ports=25,587,3306,4444,5432,6379,9300,11211 - - -enable-ipv6=true + - -enable-ipv6=false - -enable-pprof=false - --meshed-http2-client-params={"keep_alive":{"interval":{"seconds":10},"timeout":{"seconds":3},"while_idle":true}} image: cr.l5d.io/linkerd/controller:install-control-plane-version @@ -1595,6 +1596,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port @@ -1813,7 +1815,7 @@ spec: - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR value: "127.0.0.1:4140" - name: LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS - value: "127.0.0.1:4140,[::1]:4140" + value: "127.0.0.1:4140" - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: "[::]:4143" - name: LINKERD2_PROXY_INBOUND_IPS @@ -1956,6 +1958,7 @@ spec: readOnly: true initContainers: - args: + - --ipv6=false - --incoming-proxy-port - "4143" - --outgoing-proxy-port diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index d6aca4db6f7dd..0e6af9d958998 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -47,6 +47,7 @@ "path": "/spec/initContainers/-", "value": { "args": [ + "--ipv6=false", "--incoming-proxy-port", "4143", "--outgoing-proxy-port", @@ -251,7 +252,7 @@ }, { "name": "LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS", - "value": "127.0.0.1:4140,[::1]:4140" + "value": "127.0.0.1:4140" }, { "name": "LINKERD2_PROXY_INBOUND_LISTEN_ADDR", diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index e7b457094acff..27c34f4664c51 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -57,6 +57,7 @@ "path": "/spec/initContainers/-", "value": { "args": [ + "--ipv6=false", "--incoming-proxy-port", "4143", "--outgoing-proxy-port", @@ -237,7 +238,7 @@ }, { "name": "LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS", - "value": "127.0.0.1:4140,[::1]:4140" + "value": "127.0.0.1:4140" }, { "name": "LINKERD2_PROXY_INBOUND_LISTEN_ADDR", diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 86df8376065aa..a43bf7d77012a 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -47,6 +47,7 @@ "path": "/spec/initContainers/-", "value": { "args": [ + "--ipv6=false", "--incoming-proxy-port", "4143", "--outgoing-proxy-port", @@ -227,7 +228,7 @@ }, { "name": "LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS", - "value": "127.0.0.1:4140,[::1]:4140" + "value": "127.0.0.1:4140" }, { "name": "LINKERD2_PROXY_INBOUND_LISTEN_ADDR", diff --git a/pkg/charts/linkerd2/values_test.go b/pkg/charts/linkerd2/values_test.go index 3779376af96fc..c4567bbc43abf 100644 --- a/pkg/charts/linkerd2/values_test.go +++ b/pkg/charts/linkerd2/values_test.go @@ -67,7 +67,7 @@ func TestNewValues(t *testing.T) { PodAnnotations: map[string]string{}, PodLabels: map[string]string{}, EnableEndpointSlices: true, - DisableIPv6: false, + DisableIPv6: true, EnablePodDisruptionBudget: false, Controller: &Controller{ PodDisruptionBudget: &PodDisruptionBudget{ diff --git a/test/integration/deep/norelay/norelay_test.go b/test/integration/deep/norelay/norelay_test.go index 3ef89de1b45bc..cd43f97c32b49 100644 --- a/test/integration/deep/norelay/norelay_test.go +++ b/test/integration/deep/norelay/norelay_test.go @@ -73,11 +73,19 @@ func TestNoRelay(t *testing.T) { func TestRelay(t *testing.T) { ctx := context.Background() deployments := getDeployments(t) + + // account for both when IPv6 is enabled or disabled deployments["server-relay"] = strings.ReplaceAll( deployments["server-relay"], "127.0.0.1:4140,[::1]:4140", "'[::]:4140'", ) + deployments["server-relay"] = strings.ReplaceAll( + deployments["server-relay"], + "127.0.0.1:4140", + "0.0.0.0:4140", + ) + TestHelper.WithDataPlaneNamespace(ctx, "relay-test", map[string]string{}, t, func(t *testing.T, ns string) { for name, res := range deployments { out, err := TestHelper.KubectlApply(res, ns) diff --git a/test/integration/install/inject/inject_test.go b/test/integration/install/inject/inject_test.go index 0d8f2fac8cdfd..3769a532ec169 100644 --- a/test/integration/install/inject/inject_test.go +++ b/test/integration/install/inject/inject_test.go @@ -396,6 +396,7 @@ func TestInjectAutoPod(t *testing.T) { Name: k8s.InitContainerName, Image: reg + "/proxy-init:" + version.ProxyInitVersion, Args: []string{ + "--ipv6=false", "--incoming-proxy-port", "4143", "--outgoing-proxy-port", "4140", "--proxy-uid", "2102", diff --git a/testutil/inject_validator.go b/testutil/inject_validator.go index f76743b09e601..99f3c8814396f 100644 --- a/testutil/inject_validator.go +++ b/testutil/inject_validator.go @@ -158,7 +158,7 @@ func (iv *InjectValidator) validateProxyContainer(pod *v1.PodSpec) error { if err := iv.validateEnvVar( proxyContainer, "LINKERD2_PROXY_OUTBOUND_LISTEN_ADDRS", - fmt.Sprintf("127.0.0.1:%d,[::1]:%d", iv.OutboundPort, iv.OutboundPort), + fmt.Sprintf("127.0.0.1:%d", iv.OutboundPort), ); err != nil { return err } From f2a426917390ea4776a7bb6601dc5d87a342bf85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:28:08 -0700 Subject: [PATCH 11/15] build(deps): bump serde_json from 1.0.116 to 1.0.117 (#12577) Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.116 to 1.0.117. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.116...v1.0.117) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- policy-controller/k8s/status/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21874e746c7f7..759cf87fd350c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2045,9 +2045,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", diff --git a/policy-controller/k8s/status/Cargo.toml b/policy-controller/k8s/status/Cargo.toml index 6ba40691dfe06..fe21478bc47eb 100644 --- a/policy-controller/k8s/status/Cargo.toml +++ b/policy-controller/k8s/status/Cargo.toml @@ -20,7 +20,7 @@ linkerd-policy-controller-k8s-api = { path = "../api" } parking_lot = "0.12" prometheus-client = { version = "0.22.0", default-features = false } serde = "1" -serde_json = "1.0.116" +serde_json = "1.0.117" thiserror = "1" tokio = { version = "1", features = ["macros"] } tracing = "0.1.40" From 8ba3e3c96023740352ce951088c33117532da44a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:28:39 -0700 Subject: [PATCH 12/15] build(deps): bump errno from 0.3.8 to 0.3.9 (#12578) Bumps [errno](https://github.com/lambda-fairy/rust-errno) from 0.3.8 to 0.3.9. - [Changelog](https://github.com/lambda-fairy/rust-errno/blob/main/CHANGELOG.md) - [Commits](https://github.com/lambda-fairy/rust-errno/commits) --- updated-dependencies: - dependency-name: errno dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 759cf87fd350c..e6a3eccc4bbf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -456,9 +456,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", From 76add39b5486c61a18f568ee4da0b5eba7556ac6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:28:57 -0700 Subject: [PATCH 13/15] build(deps): bump rustversion from 1.0.15 to 1.0.16 (#12579) Bumps [rustversion](https://github.com/dtolnay/rustversion) from 1.0.15 to 1.0.16. - [Release notes](https://github.com/dtolnay/rustversion/releases) - [Commits](https://github.com/dtolnay/rustversion/compare/1.0.15...1.0.16) --- updated-dependencies: - dependency-name: rustversion dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6a3eccc4bbf4..6b0fe00e0c087 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1910,9 +1910,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "ryu" From ba3f44e824c5bddb9f4bc31b9c86d257b9c582c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:29:19 -0700 Subject: [PATCH 14/15] build(deps): bump proc-macro2 from 1.0.81 to 1.0.82 (#12580) Bumps [proc-macro2](https://github.com/dtolnay/proc-macro2) from 1.0.81 to 1.0.82. - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.81...1.0.82) --- updated-dependencies: - dependency-name: proc-macro2 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b0fe00e0c087..ecf3743f6ab23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1654,9 +1654,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] From f8f9650b881c3e683a4423e395ce367366f93916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:30:01 -0700 Subject: [PATCH 15/15] build(deps): bump zerocopy from 0.7.33 to 0.7.34 (#12581) Bumps [zerocopy](https://github.com/google/zerocopy) from 0.7.33 to 0.7.34. - [Release notes](https://github.com/google/zerocopy/releases) - [Changelog](https://github.com/google/zerocopy/blob/main/CHANGELOG.md) - [Commits](https://github.com/google/zerocopy/commits) --- updated-dependencies: - dependency-name: zerocopy dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecf3743f6ab23..10464a12aae55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2836,18 +2836,18 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "zerocopy" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote",