Merge pull request #4389 from pedjak/use-chart-proxy-in-ui

Retrieve the list of Helm charts via chart repo proxy endpoint
openshift · Mar 2, 2020 · 7e59754 · 7e59754
2 parents 44d2165 + 7de25fa
commit 7e59754
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/frontend/public/components/catalog/catalog-page.tsx b/frontend/public/components/catalog/catalog-page.tsx
@@ -334,13 +334,11 @@ export const Catalog = connectToFlags<CatalogProps>(
   }, [loadTemplates, namespace]);
 
   React.useEffect(() => {
-    coFetch('https://redhat-developer.github.io/redhat-helm-charts/index.yaml').then(
-      async (res) => {
-        const yaml = await res.text();
-        const json = safeLoad(yaml);
-        setHelmCharts(json.entries);
-      },
-    );
+    coFetch('/api/helm/charts/index.yaml').then(async (res) => {
+      const yaml = await res.text();
+      const json = safeLoad(yaml);
+      setHelmCharts(json.entries);
+    });
   }, []);
 
   const error = templateError || projectTemplateError;

diff --git a/pkg/helm/chartproxy/config.go b/pkg/helm/chartproxy/config.go
@@ -27,7 +27,7 @@ func RegisterFlags(fs *flag.FlagSet) *config {
 
 	cfg := new(config)
 
-	fs.StringVar(&cfg.repoUrl, "helm-chart-repo-url", "https://redhat-developer.github.com/redhat-helm-charts", "Helm chart repository URL")
+	fs.StringVar(&cfg.repoUrl, "helm-chart-repo-url", "https://redhat-developer.github.io/redhat-helm-charts", "Helm chart repository URL")
 	fs.StringVar(&cfg.repoCaFile, "helm-chart-repo-ca-file", "", "CA bundle for Helm chart repository.")
 
 	return cfg

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -320,7 +320,8 @@ func (s *Server) HTTPHandler() http.Handler {
 
 	helmChartRepoProxy := proxy.NewProxy(s.HelmChartRepoProxyConfig)
 
-	handle(helmChartRepoProxyEndpoint, http.StripPrefix(
+	// Only proxy requests to chart repo index file
+	handle(helmChartRepoProxyEndpoint+"index.yaml", http.StripPrefix(
 		proxy.SingleJoiningSlash(s.BaseURL.Path, helmChartRepoProxyEndpoint),
 		http.HandlerFunc(helmChartRepoProxy.ServeHTTP)))