fix: upgrade image improvement

New flag. Proxy image management. Fixes: siderolabs#8275 Signed-off-by: Matthieu STROHL <mstrohl@dive-in-it.com>
mstrohl · Feb 13, 2024 · a5d0223 · a5d0223
1 parent e452513
commit a5d0223
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/cmd/talosctl/cmd/talos/upgrade-k8s.go b/cmd/talosctl/cmd/talos/upgrade-k8s.go
@@ -48,6 +48,7 @@ func init() {
 	upgradeK8sCmd.Flags().BoolVarP(&upgradeK8sCmdFlags.withDocs, "with-docs", "", true, "patch all machine configs adding the documentation for each field")
 	upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.DryRun, "dry-run", false, "skip the actual upgrade and show the upgrade plan instead")
 	upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.PrePullImages, "pre-pull-images", true, "pre-pull images before upgrade")
+	upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.CustomRegistry, "custom-registry", false, "keep customized registry setting")
 	upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.UpgradeKubelet, "upgrade-kubelet", true, "upgrade kubelet service")
 	addCommand(upgradeK8sCmd)
 }

diff --git a/pkg/cluster/kubernetes/kubelet.go b/pkg/cluster/kubernetes/kubelet.go
@@ -198,8 +198,14 @@ func upgradeKubeletPatcher(
 				options.Log(" > skipped in dry-run")
 			}
 		}
+		imageName := constants.KubeletImage
 
-		image := fmt.Sprintf("%s:v%s", constants.KubeletImage, options.Path.ToVersion())
+		privateRepo := strings.Split(config.MachineConfig.MachineKubelet.KubeletImage, ":")[0]
+		if privateRepo != imageName && options.CustomRegistry {
+			imageName = privateRepo
+		}
+
+		image := fmt.Sprintf("%s:v%s", imageName, options.Path.ToVersion())
 
 		if oldImage == image {
 			return errUpdateSkipped
@@ -210,7 +216,7 @@ func upgradeKubeletPatcher(
 		if options.DryRun {
 			return errUpdateSkipped
 		}
-
+		options.Log(" > using Kubelet Image %s", image)
 		config.MachineConfig.MachineKubelet.KubeletImage = image
 
 		return nil

diff --git a/pkg/cluster/kubernetes/talos_managed.go b/pkg/cluster/kubernetes/talos_managed.go
@@ -206,7 +206,14 @@ func patchKubeProxy(options UpgradeOptions) func(config *v1alpha1config.Config)
 			config.ClusterConfig.ProxyConfig = &v1alpha1config.ProxyConfig{}
 		}
 
-		config.ClusterConfig.ProxyConfig.ContainerImage = fmt.Sprintf("%s:v%s", constants.KubeProxyImage, options.Path.ToVersion())
+		imageName := constants.KubeProxyImage
+
+		privateRepo := strings.Split(config.ClusterConfig.ProxyConfig.ContainerImage, ":")[0]
+		if privateRepo != imageName && options.CustomRegistry {
+			imageName = privateRepo
+		}
+
+		config.ClusterConfig.ProxyConfig.ContainerImage = fmt.Sprintf("%s:v%s", imageName, options.Path.ToVersion())
 
 		return nil
 	}
@@ -308,7 +315,7 @@ func staticPodImage(logUpdate func(oldImage string), service string, defaultImag
 	imageName := defaultImage
 
 	privateRepo := strings.Split(containerImage, ":")[0]
-	if privateRepo != defaultImage && !options.PrePullImages {
+	if privateRepo != defaultImage && !options.PrePullImages && options.CustomRegistry {
 		imageName = privateRepo
 	}
 
@@ -376,7 +383,7 @@ func upgradeStaticPodPatcher(options UpgradeOptions, service string, configResou
 			image, err := staticPodImage(logUpdate,
 				service,
 				constants.KubernetesAPIServerImage,
-				strings.Split(config.ClusterConfig.APIServerConfig.ContainerImage, ":")[0],
+				config.ClusterConfig.APIServerConfig.ContainerImage,
 				configImage,
 				options)
 			if err != nil {
@@ -392,7 +399,7 @@ func upgradeStaticPodPatcher(options UpgradeOptions, service string, configResou
 			image, err := staticPodImage(logUpdate,
 				service,
 				constants.KubernetesControllerManagerImage,
-				strings.Split(config.ClusterConfig.ControllerManagerConfig.ContainerImage, ":")[0],
+				config.ClusterConfig.ControllerManagerConfig.ContainerImage,
 				configImage,
 				options)
 			if err != nil {
@@ -408,7 +415,7 @@ func upgradeStaticPodPatcher(options UpgradeOptions, service string, configResou
 			image, err := staticPodImage(logUpdate,
 				service,
 				constants.KubernetesSchedulerImage,
-				strings.Split(config.ClusterConfig.SchedulerConfig.ContainerImage, ":")[0],
+				config.ClusterConfig.SchedulerConfig.ContainerImage,
 				configImage,
 				options)
 			if err != nil {

diff --git a/pkg/cluster/kubernetes/upgrade.go b/pkg/cluster/kubernetes/upgrade.go
@@ -28,6 +28,7 @@ type UpgradeOptions struct {
 	ControlPlaneEndpoint string
 	LogOutput            io.Writer
 	PrePullImages        bool
+	CustomRegistry       bool
 	UpgradeKubelet       bool
 	DryRun               bool
 	EncoderOpt           encoder.Option