Skip to content

Commit 372b456

Browse files
committed
Switch to better-documented official external-dns chart
Signed-off-by: Robert Detjens <[email protected]>
1 parent c9ba519 commit 372b456

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

src/asset_files/setup_manifests/external-dns.helm.yaml.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ txtOwnerId: "k8s-external-dns"
2020
txtPrefix: "k8s-owner."
2121

2222
extraArgs:
23-
# ignore any services with internal ips
24-
#exclude-target-net: "10.0.0.0/8"
2523
# special character replacement
26-
txt-wildcard-replacement: star
24+
- --txt-wildcard-replacement=star
2725

2826
## Limit external-dns resources
2927
resources:

src/cluster_setup/mod.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ pub async fn install_ingress(profile: &config::ProfileConfig) -> Result<()> {
4040
install_helm_chart(
4141
profile,
4242
"ingress-nginx",
43-
Some("https://kubernetes.github.io/ingress-nginx"),
43+
"https://kubernetes.github.io/ingress-nginx",
44+
None,
4445
"ingress-nginx",
4546
INGRESS_NAMESPACE,
4647
VALUES,
@@ -57,7 +58,8 @@ pub async fn install_certmanager(profile: &config::ProfileConfig) -> Result<()>
5758
install_helm_chart(
5859
profile,
5960
"cert-manager",
60-
Some("https://charts.jetstack.io"),
61+
"https://charts.jetstack.io",
62+
None,
6163
"cert-manager",
6264
INGRESS_NAMESPACE,
6365
VALUES,
@@ -90,7 +92,8 @@ pub async fn install_extdns(profile: &config::ProfileConfig) -> Result<()> {
9092

9193
install_helm_chart(
9294
profile,
93-
"oci://registry-1.docker.io/bitnamicharts/external-dns",
95+
"external-dns",
96+
"https://kubernetes-sigs.github.io/external-dns",
9497
None,
9598
"external-dns",
9699
INGRESS_NAMESPACE,
@@ -106,7 +109,8 @@ pub async fn install_extdns(profile: &config::ProfileConfig) -> Result<()> {
106109
fn install_helm_chart(
107110
profile: &config::ProfileConfig,
108111
chart: &str,
109-
repo: Option<&str>,
112+
repo: &str,
113+
version: Option<&str>,
110114
release_name: &str,
111115
namespace: &str,
112116
values: &str,
@@ -123,8 +127,8 @@ fn install_helm_chart(
123127
.tempfile()?;
124128
temp_values.write_all(values.as_bytes())?;
125129

126-
let repo_arg = match repo {
127-
Some(r) => format!("--repo {r}"),
130+
let version_arg = match version {
131+
Some(v) => format!("--version {v}"),
128132
None => "".to_string(),
129133
};
130134

@@ -139,7 +143,7 @@ fn install_helm_chart(
139143
r#"
140144
upgrade --install
141145
{release_name}
142-
{chart} {repo_arg}
146+
{chart} --repo {repo} {version_arg}
143147
--namespace {namespace} --create-namespace
144148
--values {}
145149
--wait --timeout 1m

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use beavercds_ng::commands;
22
use clap::Parser;
3-
use tracing::{trace, Level};
3+
use tracing::{error, trace, Level};
44
use tracing_subscriber::{
55
fmt::{format::FmtSpan, time},
66
EnvFilter,

0 commit comments

Comments
 (0)