Merge pull request #1540 from fluxcd/backport-1539-to-release/v1.7.x

[release/v1.7.x] Allow fetching artifacts from a local source-watcher

Author: stefanprodan

internal/controller/kustomization_controller.go

@@ -326,13 +326,19 @@ func (r *KustomizationReconciler) reconcile(
 		}
 	}(tmpDir)
 
+	// Set the artifact URL hostname override for localhost access.
+	sourceLocalhost := os.Getenv("SOURCE_CONTROLLER_LOCALHOST")
+	if strings.Contains(src.GetArtifact().URL, "//source-watcher") {
+		sourceLocalhost = os.Getenv("SOURCE_WATCHER_LOCALHOST")
+	}
+
 	// Download artifact and extract files to the tmp dir.
 	fetcher := fetch.New(
 		fetch.WithLogger(ctrl.LoggerFrom(ctx)),
 		fetch.WithRetries(r.ArtifactFetchRetries),
 		fetch.WithMaxDownloadSize(tar.UnlimitedUntarSize),
 		fetch.WithUntar(tar.WithMaxUntarSize(tar.UnlimitedUntarSize)),
-		fetch.WithHostnameOverwrite(os.Getenv("SOURCE_CONTROLLER_LOCALHOST")),
+		fetch.WithHostnameOverwrite(sourceLocalhost),
 	)
 	if err = fetcher.Fetch(src.GetArtifact().URL, src.GetArtifact().Digest, tmpDir); err != nil {
 		conditions.MarkFalse(obj, meta.ReadyCondition, meta.ArtifactFailedReason, "%s", err)