Fix helmhub insecure issue when using with a proxy (#12014)

Signed-off-by: peimingming <peimingming@corp.netease.com>
This commit is contained in:
mmpei 2020-05-28 10:57:51 +08:00 committed by GitHub
parent 9f5f8e4681
commit 7c2bfb1378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 6 deletions

View File

@ -37,7 +37,12 @@ func TestPrepareForPush(t *testing.T) {
}
func TestHealthCheck(t *testing.T) {
adapter, _ := newAdapter(nil)
registry := &model.Registry{
Type: model.RegistryTypeHelmHub,
URL: baseURL,
Insecure: true,
}
adapter, _ := newAdapter(registry)
status, err := adapter.HealthCheck()
require.Equal(t, model.Healthy, string(status))
require.Nil(t, err)

View File

@ -23,7 +23,12 @@ import (
)
func TestFetchCharts(t *testing.T) {
adapter, err := newAdapter(nil)
registry := &model.Registry{
Type: model.RegistryTypeHelmHub,
URL: baseURL,
Insecure: false,
}
adapter, err := newAdapter(registry)
require.Nil(t, err)
// filter 1
filters := []*model.Filter{
@ -55,7 +60,12 @@ func TestFetchCharts(t *testing.T) {
}
func TestChartExist(t *testing.T) {
adapter, err := newAdapter(nil)
registry := &model.Registry{
Type: model.RegistryTypeHelmHub,
URL: baseURL,
Insecure: false,
}
adapter, err := newAdapter(registry)
require.Nil(t, err)
exist, err := adapter.ChartExist("harbor/harbor", "1.0.0")
require.Nil(t, err)
@ -63,7 +73,12 @@ func TestChartExist(t *testing.T) {
}
func TestChartExist2(t *testing.T) {
adapter, err := newAdapter(nil)
registry := &model.Registry{
Type: model.RegistryTypeHelmHub,
URL: baseURL,
Insecure: false,
}
adapter, err := newAdapter(registry)
require.Nil(t, err)
exist, err := adapter.ChartExist("goharbor/harbor", "1.0.0")
require.Nil(t, err)
@ -75,7 +90,12 @@ func TestChartExist2(t *testing.T) {
}
func TestDownloadChart(t *testing.T) {
adapter, err := newAdapter(nil)
registry := &model.Registry{
Type: model.RegistryTypeHelmHub,
URL: baseURL,
Insecure: false,
}
adapter, err := newAdapter(registry)
require.Nil(t, err)
_, err = adapter.DownloadChart("harbor/harbor", "1.0.0")
require.Nil(t, err)

View File

@ -22,7 +22,7 @@ type Client struct {
func NewClient(registry *model.Registry) *Client {
return &Client{
client: &http.Client{
Transport: util.GetHTTPTransport(false),
Transport: util.GetHTTPTransport(registry.Insecure),
},
}
}