From 3baa3750cba7f371768a424e8c8cdb2e16338b1a Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Wed, 23 Oct 2024 17:38:02 +0200 Subject: [PATCH] fix(clustertool): dont use spegel on talos images for stability --- charts/incubator/spegel/Chart.yaml | 2 +- charts/incubator/spegel/values.yaml | 2 +- .../system/spegel/app/helm-release.yaml | 2 +- clustertool/pkg/initfiles/initfiles.go | 22 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/charts/incubator/spegel/Chart.yaml b/charts/incubator/spegel/Chart.yaml index 7d9a289ecc9da..f00d93648f1a6 100644 --- a/charts/incubator/spegel/Chart.yaml +++ b/charts/incubator/spegel/Chart.yaml @@ -30,4 +30,4 @@ name: spegel sources: - https://github.com/truecharts/charts/tree/master/charts/system/spegel type: application -version: 2.0.2 +version: 2.0.3 diff --git a/charts/incubator/spegel/values.yaml b/charts/incubator/spegel/values.yaml index 29d94dcf29404..c0f079bbe634c 100644 --- a/charts/incubator/spegel/values.yaml +++ b/charts/incubator/spegel/values.yaml @@ -132,7 +132,7 @@ spegel: - https://registry.k8s.io - https://k8s.gcr.io - https://tccr.io - - https://factory.talos.dev + # - https://factory.talos.dev # -- Additional target mirror registries other than Spegel. additionalMirrorRegistries: [] # -- Max ammount of mirrors to attempt. diff --git a/clustertool/embed/generic/kubernetes/system/spegel/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/spegel/app/helm-release.yaml index 097e61752d893..a3eecff82e5f0 100644 --- a/clustertool/embed/generic/kubernetes/system/spegel/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/spegel/app/helm-release.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: spegel - version: 2.0.2 + version: 2.0.3 sourceRef: kind: HelmRepository name: truecharts diff --git a/clustertool/pkg/initfiles/initfiles.go b/clustertool/pkg/initfiles/initfiles.go index ff8f8d22cae8e..57dea66d23e77 100644 --- a/clustertool/pkg/initfiles/initfiles.go +++ b/clustertool/pkg/initfiles/initfiles.go @@ -414,12 +414,12 @@ func setSpegel() { - http://127.0.0.1:30021 - http://%s:5000 - https://tccr.io - factory.talos.dev: - endpoints: - - http://127.0.0.1:30020 - - http://127.0.0.1:30021 - - http://%s:5000 - - https://factory.talos.dev + # factory.talos.dev: + # endpoints: + # - http://127.0.0.1:30020 + # - http://127.0.0.1:30021 + # - http://%s:5000 + # - https://factory.talos.dev `, helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"], helper.TalEnv["SPEGEL_IP"]) @@ -489,11 +489,11 @@ func setSpegel() { - http://127.0.0.1:30020 - http://127.0.0.1:30021 - https://tccr.io - factory.talos.dev: - endpoints: - - http://127.0.0.1:30020 - - http://127.0.0.1:30021 - - https://factory.talos.dev + # factory.talos.dev: + # endpoints: + # - http://127.0.0.1:30020 + # - http://127.0.0.1:30021 + # - https://factory.talos.dev `)