Skip to content

Commit 46bfb45

Browse files
committed
f
1 parent c111134 commit 46bfb45

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

api/integration/app/install/config_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/replicatedhq/embedded-cluster/api/internal/states"
1919
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
2020
"github.com/replicatedhq/embedded-cluster/api/types"
21+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2122
"github.com/replicatedhq/embedded-cluster/pkg/release"
2223
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2324
"github.com/replicatedhq/kotskinds/multitype"
@@ -1046,6 +1047,7 @@ func TestAppInstallSuite(t *testing.T) {
10461047
controller, err := linuxinstall.NewInstallController(
10471048
linuxinstall.WithStateMachine(linuxinstall.NewStateMachine(linuxinstall.WithCurrentState(initialState))),
10481049
linuxinstall.WithReleaseData(rd),
1050+
linuxinstall.WithHelmClient(&helm.MockClient{}),
10491051
linuxinstall.WithLicense([]byte("spec:\n licenseID: test-license\n")),
10501052
linuxinstall.WithConfigValues(configValues),
10511053
)
@@ -1066,6 +1068,7 @@ func TestAppInstallSuite(t *testing.T) {
10661068
controller, err := kubernetesinstall.NewInstallController(
10671069
kubernetesinstall.WithStateMachine(kubernetesinstall.NewStateMachine(kubernetesinstall.WithCurrentState(initialState))),
10681070
kubernetesinstall.WithReleaseData(rd),
1071+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
10691072
kubernetesinstall.WithLicense([]byte("spec:\n licenseID: test-license\n")),
10701073
kubernetesinstall.WithConfigValues(configValues),
10711074
)

api/integration/app/upgrade/apppreflight_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
2828
"github.com/replicatedhq/embedded-cluster/pkg-new/kubernetesinstallation"
2929
"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
30+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
3031
"github.com/replicatedhq/embedded-cluster/pkg/release"
3132
"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
3233
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
@@ -441,6 +442,7 @@ func TestAppPreflightSuite(t *testing.T) {
441442
},
442443
AppConfig: &kotsv1beta1.Config{},
443444
}),
445+
linuxupgrade.WithHelmClient(&helm.MockClient{}),
444446
linuxupgrade.WithAppController(appController),
445447
linuxupgrade.WithInfraManager(mockInfraManager),
446448
)
@@ -481,6 +483,7 @@ func TestAppPreflightSuite(t *testing.T) {
481483
controller, err := kubernetesupgrade.NewUpgradeController(
482484
kubernetesupgrade.WithStateMachine(stateMachine),
483485
kubernetesupgrade.WithReleaseData(rd),
486+
kubernetesupgrade.WithHelmClient(&helm.MockClient{}),
484487
kubernetesupgrade.WithAppController(appController),
485488
)
486489
require.NoError(t, err)

api/integration/app/upgrade/config_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/replicatedhq/embedded-cluster/api/internal/states"
1919
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
2020
"github.com/replicatedhq/embedded-cluster/api/types"
21+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2122
"github.com/replicatedhq/embedded-cluster/pkg/release"
2223
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2324
"github.com/replicatedhq/kotskinds/multitype"
@@ -358,6 +359,7 @@ func TestAppConfigSuite(t *testing.T) {
358359
linuxupgrade.WithStateMachine(linuxupgrade.NewStateMachine(linuxupgrade.WithCurrentState(state))),
359360
linuxupgrade.WithConfigValues(configValues),
360361
linuxupgrade.WithReleaseData(releaseData),
362+
linuxupgrade.WithHelmClient(&helm.MockClient{}),
361363
linuxupgrade.WithInfraManager(mockInfraManager),
362364
)
363365
require.NoError(t, err)
@@ -389,6 +391,7 @@ func TestAppConfigSuite(t *testing.T) {
389391
kubernetesupgrade.WithStateMachine(kubernetesupgrade.NewStateMachine(kubernetesupgrade.WithCurrentState(state))),
390392
kubernetesupgrade.WithConfigValues(configValues),
391393
kubernetesupgrade.WithReleaseData(releaseData),
394+
kubernetesupgrade.WithHelmClient(&helm.MockClient{}),
392395
)
393396
require.NoError(t, err)
394397

api/integration/app/upgrade/upgrade_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
appupgradestore "github.com/replicatedhq/embedded-cluster/api/internal/store/app/upgrade"
2525
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
2626
"github.com/replicatedhq/embedded-cluster/api/types"
27+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2728
"github.com/replicatedhq/embedded-cluster/pkg/release"
2829
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2930
"github.com/stretchr/testify/assert"
@@ -360,6 +361,7 @@ func TestAppUpgradeSuite(t *testing.T) {
360361
controller, err := linuxupgrade.NewUpgradeController(
361362
linuxupgrade.WithStateMachine(stateMachine),
362363
linuxupgrade.WithReleaseData(rd),
364+
linuxupgrade.WithHelmClient(&helm.MockClient{}),
363365
linuxupgrade.WithAppController(appController),
364366
linuxupgrade.WithInfraManager(mockInfraManager),
365367
)
@@ -391,6 +393,7 @@ func TestAppUpgradeSuite(t *testing.T) {
391393
controller, err := kubernetesupgrade.NewUpgradeController(
392394
kubernetesupgrade.WithStateMachine(stateMachine),
393395
kubernetesupgrade.WithReleaseData(rd),
396+
kubernetesupgrade.WithHelmClient(&helm.MockClient{}),
394397
kubernetesupgrade.WithAppController(appController),
395398
)
396399
require.NoError(t, err)

0 commit comments

Comments
 (0)