diff --git a/config/config.yaml.dist b/config/config.yaml.dist index f2fad706d1..12906be809 100644 --- a/config/config.yaml.dist +++ b/config/config.yaml.dist @@ -243,10 +243,10 @@ dex: # # charts: # externalDns: -# chart: "stable/external-dns" -# version: "2.15.2" +# chart: "bitnami/external-dns" +# version: "4.5.0" # -# # See https://github.com/helm/charts/tree/master/stable/external-dns for details +# # See https://github.com/bitnami/charts/tree/master/bitnami/external-dns for details # values: {} # # securityScan: @@ -421,6 +421,7 @@ dex: # repositories: # stable: "https://charts.helm.sh/stable" # banzaicloud-stable: "https://kubernetes-charts.banzaicloud.com" +# bitnami: "https://charts.bitnami.com/bitnami" # loki: "https://grafana.github.io/loki/charts" # kubefed-charts: "https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts" diff --git a/internal/cmd/config.go b/internal/cmd/config.go index 8c3e053e66..b093a1a069 100644 --- a/internal/cmd/config.go +++ b/internal/cmd/config.go @@ -648,12 +648,12 @@ func Configure(v *viper.Viper, p *pflag.FlagSet) { v.SetDefault("cluster::dns::namespace", "") v.SetDefault("cluster::dns::baseDomain", "") v.SetDefault("cluster::dns::providerSecret", "secret/data/banzaicloud/aws") - v.SetDefault("cluster::dns::charts::externalDns::chart", "stable/external-dns") - v.SetDefault("cluster::dns::charts::externalDns::version", "2.15.2") + v.SetDefault("cluster::dns::charts::externalDns::chart", "bitnami/external-dns") + v.SetDefault("cluster::dns::charts::externalDns::version", "4.5.0") v.SetDefault("cluster::dns::charts::externalDns::values", map[string]interface{}{ "image": map[string]interface{}{ - "repository": "bitnami/external-dns", - "tag": "0.5.18", + "repository": "k8s.gcr.io/external-dns/external-dns", + "tag": "v0.7.5", }, }) @@ -874,6 +874,7 @@ traefik: v.SetDefault("helm::home", "./var/cache") v.SetDefault("helm::repositories::stable", "https://charts.helm.sh/stable") v.SetDefault("helm::repositories::banzaicloud-stable", "https://kubernetes-charts.banzaicloud.com") + v.SetDefault("helm::repositories::bitnami", "https://charts.bitnami.com/bitnami") v.SetDefault("helm::repositories::loki", "https://grafana.github.io/loki/charts") v.SetDefault("helm::repositories::kubefed-charts", "https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts") diff --git a/internal/cmd/config_test.go b/internal/cmd/config_test.go index 6cd95beb62..d80360563e 100644 --- a/internal/cmd/config_test.go +++ b/internal/cmd/config_test.go @@ -52,13 +52,13 @@ func TestConfigure_DefaultValueBinding(t *testing.T) { Charts: dns.ChartsConfig{ ExternalDNS: dns.ExternalDNSChartConfig{ ChartConfigBase: dns.ChartConfigBase{ - Chart: "stable/external-dns", - Version: "2.15.2", + Chart: "bitnami/external-dns", + Version: "4.5.0", }, Values: dns.ExternalDNSChartValuesConfig{ Image: dns.ExternalDNSChartValuesImageConfig{ - Repository: "bitnami/external-dns", - Tag: "0.5.18", + Repository: "k8s.gcr.io/external-dns/external-dns", + Tag: "v0.7.5", }, }, }, diff --git a/internal/federation/reconcile_ext_dns_test.go b/internal/federation/reconcile_ext_dns_test.go index b05366b142..2b9b31e10e 100644 --- a/internal/federation/reconcile_ext_dns_test.go +++ b/internal/federation/reconcile_ext_dns_test.go @@ -28,9 +28,9 @@ import ( func testEnsureCRDSourceForExtDNS(testNamespace string) func(t *testing.T) { return func(t *testing.T) { - chartName := "stable/external-dns" + chartName := "bitnami/external-dns" releaseName := "fed-ext-dns" - chartVersion := "2.15.2" + chartVersion := "4.5.0" clusterId := uint(1) @@ -60,7 +60,8 @@ func testEnsureCRDSourceForExtDNS(testNamespace string) func(t *testing.T) { config := helm.Config{ Home: home, Repositories: map[string]string{ - "stable": "https://charts.helm.sh/stable", + "stable": "https://charts.helm.sh/stable", + "bitnami": "https://charts.bitnami.com/bitnami", }, } diff --git a/internal/helm/service_test.go b/internal/helm/service_test.go index 4a46c1bd72..512ac67503 100644 --- a/internal/helm/service_test.go +++ b/internal/helm/service_test.go @@ -228,6 +228,10 @@ func Test_service_ListRepositories(t *testing.T) { Name: "banzaicloud-stable", URL: "https://kubernetes-charts.banzaicloud.com", }, + { + Name: "bitnami", + URL: "https://charts.bitnami.com/bitnami", + }, { Name: "loki", URL: "https://grafana.github.io/loki/charts", @@ -251,6 +255,10 @@ func Test_service_ListRepositories(t *testing.T) { Name: "banzaicloud-stable", URL: "https://kubernetes-charts.banzaicloud.com", }, + { + Name: "bitnami", + URL: "https://charts.bitnami.com/bitnami", + }, { Name: "loki", URL: "https://grafana.github.io/loki/charts",