Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 14:26:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

cli: helm: move csp into ChartLoader object

Browse source
This commit is contained in:
Otto Bittner 2023-02-14 18:00:36 +01:00
parent 1728633646
commit 4855b20093
2 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/internal/helm/loader_test.go
View file

@ -35,8 +35,8 @@ func TestLoad(t *testing.T) {
assert := assert.New(t)
require := require.New(t)
chartLoader := ChartLoader{}
config := &config.Config{Provider: config.ProviderConfig{GCP: &config.GCPConfig{}}}
chartLoader := ChartLoader{csp: config.GetProvider()}
release, err := chartLoader.Load(config, true, []byte("secret"), []byte("salt"))
require.NoError(err)
@ -89,6 +89,7 @@ func TestConstellationServices(t *testing.T) {
require := require.New(t)
chartLoader := ChartLoader{
csp: tc.config.GetProvider(),
joinServiceImage: "joinServiceImage",
keyServiceImage: "keyServiceImage",
ccmImage: tc.ccmImage,
@ -100,7 +101,7 @@ func TestConstellationServices(t *testing.T) {
}
chart, err := loadChartsDir(helmFS, conServicesPath)
require.NoError(err)
values, err := chartLoader.loadConstellationServicesValues(tc.config.GetProvider())
values, err := chartLoader.loadConstellationServicesValues()
require.NoError(err)
err = extendConstellationServicesValues(values, tc.config, []byte("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), []byte("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))
require.NoError(err)
@ -160,6 +161,7 @@ func TestOperators(t *testing.T) {
require := require.New(t)
chartLoader := ChartLoader{
csp: tc.csp,
joinServiceImage: "joinServiceImage",
keyServiceImage: "keyServiceImage",
ccmImage: "ccmImage",
@ -170,7 +172,7 @@ func TestOperators(t *testing.T) {
}
chart, err := loadChartsDir(helmFS, conOperatorsPath)
require.NoError(err)
vals, err := chartLoader.loadOperatorsValues(tc.csp)
vals, err := chartLoader.loadOperatorsValues()
require.NoError(err)
options := chartutil.ReleaseOptions{