IPV6 -> IPV6_SUPPORT

Razz4780 · Feb 7, 2025 · 3adb319 · 3adb319
1 parent a41f993
commit 3adb319
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/mirrord/agent/env/src/envs.rs b/mirrord/agent/env/src/envs.rs
@@ -36,7 +36,7 @@ pub const NFTABLES: CheckedEnv<bool> = CheckedEnv::new("MIRRORD_AGENT_NFTABLES")
 pub const JSON_LOG: CheckedEnv<bool> = CheckedEnv::new("MIRRORD_AGENT_JSON_LOG");
 
 /// Enables IPv6 support in the agent.
-pub const IPV6: CheckedEnv<bool> = CheckedEnv::new("AGENT_IPV6_ENV");
+pub const IPV6_SUPPORT: CheckedEnv<bool> = CheckedEnv::new("AGENT_IPV6_ENV");
 
 /// Sets a hard timeout on DNS queries.
 pub const DNS_TIMEOUT: CheckedEnv<u32> = CheckedEnv::new("MIRRORD_AGENT_DNS_TIMEOUT");
@@ -45,7 +45,7 @@ pub const DNS_TIMEOUT: CheckedEnv<u32> = CheckedEnv::new("MIRRORD_AGENT_DNS_TIME
 pub const DNS_ATTEMPTS: CheckedEnv<u32> = CheckedEnv::new("MIRRORD_AGENT_DNS_ATTEMPTS");
 
 /// This is currently not used in the agent.
-/// 
+///
 /// Left for backwards compatibility.
 pub const POD_IPS: CheckedEnv<Vec<IpAddr>> = CheckedEnv::new("MIRRORD_AGENT_POD_IPS");
 

diff --git a/mirrord/agent/src/cli.rs b/mirrord/agent/src/cli.rs
@@ -61,7 +61,7 @@ pub struct Args {
     ///
     /// Only when this option is set will take the needed steps to run on an IPv6 single stack
     /// cluster.
-    #[arg(long, default_value_t = false, env = envs::IPV6.name)]
+    #[arg(long, default_value_t = false, env = envs::IPV6_SUPPORT.name)]
     pub ipv6: bool,
 }
 

diff --git a/mirrord/kube/src/api/container/job.rs b/mirrord/kube/src/api/container/job.rs
@@ -298,7 +298,7 @@ mod test {
                                     { "name": envs::STEALER_FLUSH_CONNECTIONS.name, "value": agent.flush_connections.to_string() },
                                     { "name": envs::NFTABLES.name, "value": agent.nftables.to_string() },
                                     { "name": envs::JSON_LOG.name, "value": Some(agent.json_log.to_string()) },
-                                    { "name": envs::IPV6.name, "value": Some(support_ipv6.to_string()) }
+                                    { "name": envs::IPV6_SUPPORT.name, "value": Some(support_ipv6.to_string()) }
 
                                 ],
                                 "resources": // Add requests to avoid getting defaulted https://github.com/metalbear-co/mirrord/issues/579
@@ -435,7 +435,7 @@ mod test {
                                     { "name": envs::STEALER_FLUSH_CONNECTIONS.name, "value": agent.flush_connections.to_string() },
                                     { "name": envs::NFTABLES.name, "value": agent.nftables.to_string() },
                                     { "name": envs::JSON_LOG.name, "value": Some(agent.json_log.to_string()) },
-                                    { "name": envs::IPV6.name, "value": Some(support_ipv6.to_string()) }
+                                    { "name": envs::IPV6_SUPPORT.name, "value": Some(support_ipv6.to_string()) }
                                 ],
                                 "resources": // Add requests to avoid getting defaulted https://github.com/metalbear-co/mirrord/issues/579
                                 {

diff --git a/mirrord/kube/src/api/container/util.rs b/mirrord/kube/src/api/container/util.rs
@@ -39,7 +39,7 @@ pub(super) fn agent_env(agent: &AgentConfig, params: &&ContainerParams) -> Vec<E
         envs::STEALER_FLUSH_CONNECTIONS.as_k8s_spec(&agent.flush_connections),
         envs::NFTABLES.as_k8s_spec(&agent.nftables),
         envs::JSON_LOG.as_k8s_spec(&agent.json_log),
-        envs::IPV6.as_k8s_spec(&params.support_ipv6),
+        envs::IPV6_SUPPORT.as_k8s_spec(&params.support_ipv6),
     ];
 
     if let Some(attempts) = agent.dns.attempts {