From 3b1f09780755bf6004a94dbf09055ab5af48ad22 Mon Sep 17 00:00:00 2001 From: yangsoon Date: Thu, 16 Dec 2021 15:17:00 +0800 Subject: [PATCH] Fix: change catlog helm repo path to https://charts.kubevela.net/example (#2942) Signed-off-by: yangsoon --- docs/examples/helm-module/webapp-chart-cd.yaml | 2 +- e2e/plugin/plugin_test.go | 2 +- pkg/appfile/appfile_test.go | 4 ++-- pkg/appfile/helm/schema_test.go | 2 +- .../componentdefinition_controller_test.go | 2 +- test/e2e-test/helm_app_test.go | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/examples/helm-module/webapp-chart-cd.yaml b/docs/examples/helm-module/webapp-chart-cd.yaml index 60591a01e..030547b9e 100644 --- a/docs/examples/helm-module/webapp-chart-cd.yaml +++ b/docs/examples/helm-module/webapp-chart-cd.yaml @@ -18,4 +18,4 @@ spec: chart: "podinfo" version: "5.1.4" repository: - url: "http://oam.dev/catalog/" + url: "https://charts.kubevela.net/example/" diff --git a/e2e/plugin/plugin_test.go b/e2e/plugin/plugin_test.go index bac010892..97fcc1109 100644 --- a/e2e/plugin/plugin_test.go +++ b/e2e/plugin/plugin_test.go @@ -415,7 +415,7 @@ spec: chart: "podinfo" version: "5.1.4" repository: - url: "http://oam.dev/catalog/" + url: "https://charts.kubevela.net/example/" ` var componentDefWithKube = ` diff --git a/pkg/appfile/appfile_test.go b/pkg/appfile/appfile_test.go index 95f9e142f..36274d0ad 100644 --- a/pkg/appfile/appfile_test.go +++ b/pkg/appfile/appfile_test.go @@ -112,7 +112,7 @@ var _ = Describe("Test Helm schematic appfile", func() { }, }), Repository: *util.Object2RawExtension(map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }), }, }, @@ -191,7 +191,7 @@ var _ = Describe("Test Helm schematic appfile", func() { "namespace": "default", }, "spec": map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }, }, }, diff --git a/pkg/appfile/helm/schema_test.go b/pkg/appfile/helm/schema_test.go index d43553fc2..0455ed808 100644 --- a/pkg/appfile/helm/schema_test.go +++ b/pkg/appfile/helm/schema_test.go @@ -53,7 +53,7 @@ func TestGenerateSchemaFromValues(t *testing.T) { } func TestGetChartValuesJSONSchema(t *testing.T) { - testHelm := testData("podinfo", "5.1.4", "http://oam.dev/catalog", "testSecret") + testHelm := testData("podinfo", "5.1.4", "https://charts.kubevela.net/example", "testSecret") wantSchema, err := os.ReadFile("./testdata/podinfo.values.schema.json") if err != nil { t.Error(err, "cannot load expected data") diff --git a/pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition/componentdefinition_controller_test.go b/pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition/componentdefinition_controller_test.go index 10a48fe25..0ba6a07cc 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition/componentdefinition_controller_test.go +++ b/pkg/controller/core.oam.dev/v1alpha2/core/components/componentdefinition/componentdefinition_controller_test.go @@ -338,7 +338,7 @@ spec: }, }), Repository: *util.Object2RawExtension(map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }), }, } diff --git a/test/e2e-test/helm_app_test.go b/test/e2e-test/helm_app_test.go index a140d56f0..5c486dc98 100644 --- a/test/e2e-test/helm_app_test.go +++ b/test/e2e-test/helm_app_test.go @@ -75,7 +75,7 @@ var _ = Describe("Test application containing helm module", func() { }, }), Repository: *util.Object2RawExtension(map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }), }, } @@ -275,7 +275,7 @@ var _ = Describe("Test application containing helm module", func() { }, }), Repository: *util.Object2RawExtension(map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }), }, } @@ -330,7 +330,7 @@ var _ = Describe("Test application containing helm module", func() { }, }), Repository: *util.Object2RawExtension(map[string]interface{}{ - "url": "http://oam.dev/catalog/", + "url": "https://charts.kubevela.net/example/", }), }, }