Merge pull request #2699 from vincepri/fix-repository

🐛 KCP spec.clusterConfiguration.imageRepository should not have "coredns/"
kubernetes-sigs · Mar 17, 2020 · cd2c55e · cd2c55e
2 parents 52269c5 + 8692ec9
commit cd2c55e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/controlplane/kubeadm/controllers/kubeadm_control_plane_controller_test.go b/controlplane/kubeadm/controllers/kubeadm_control_plane_controller_test.go
@@ -1071,7 +1071,7 @@ func TestKubeadmControlPlaneReconciler_updateCoreDNS(t *testing.T) {
 					DNS: kubeadmv1.DNS{
 						Type: kubeadmv1.CoreDNS,
 						ImageMeta: kubeadmv1.ImageMeta{
-							ImageRepository: "k8s.gcr.io/coredns",
+							ImageRepository: "k8s.gcr.io",
 							ImageTag:        "1.7.2",
 						},
 					},

diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns.go b/controlplane/kubeadm/internal/workload_cluster_coredns.go
@@ -151,7 +151,7 @@ func (w *Workload) getCoreDNSInfo(ctx context.Context, dns *kubeadmv1.DNS) (*cor
 	// Handle imageRepository.
 	toImageRepository := fmt.Sprintf("%s/%s", reference.Domain(parsedImage), reference.Path(parsedImage))
 	if dns.ImageRepository != "" {
-		toImageRepository = dns.ImageRepository
+		toImageRepository = fmt.Sprintf("%s/%s", dns.ImageRepository, reference.Path(parsedImage))
 	}
 
 	// Handle imageTag.

diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns_test.go b/controlplane/kubeadm/internal/workload_cluster_coredns_test.go
@@ -318,7 +318,7 @@ func TestGetCoreDNSInfo(t *testing.T) {
 
 		dns := &kubeadmv1.DNS{
 			ImageMeta: kubeadmv1.ImageMeta{
-				ImageRepository: "myrepo/coredns",
+				ImageRepository: "myrepo",
 				ImageTag:        "1.7.2-foobar.1",
 			},
 		}