Skip to content

Commit c111134

Browse files
emosbaughemosbaugh
committed
f
1 parent f6b2b12 commit c111134

File tree

12 files changed

+76
-0
lines changed

12 files changed

+76
-0
lines changed

‎api/integration/kubernetes/install/appconfig_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/replicatedhq/embedded-cluster/api/internal/states"
1616
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
1717
"github.com/replicatedhq/embedded-cluster/api/types"
18+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
1819
"github.com/replicatedhq/embedded-cluster/pkg/release"
1920
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2021
"github.com/replicatedhq/kotskinds/multitype"
@@ -65,6 +66,7 @@ func TestInstallController_PatchAppConfigValuesWithAPIClient(t *testing.T) {
6566
kubernetesinstall.WithReleaseData(&release.ReleaseData{
6667
AppConfig: &appConfig,
6768
}),
69+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
6870
)
6971
require.NoError(t, err)
7072

@@ -116,6 +118,7 @@ func TestInstallController_PatchAppConfigValuesWithAPIClient(t *testing.T) {
116118
kubernetesinstall.WithReleaseData(&release.ReleaseData{
117119
AppConfig: &appConfig,
118120
}),
121+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
119122
)
120123
require.NoError(t, err)
121124

@@ -219,6 +222,7 @@ func TestInstallController_GetAppConfigValuesWithAPIClient(t *testing.T) {
219222
kubernetesinstall.WithReleaseData(&release.ReleaseData{
220223
AppConfig: &appConfig,
221224
}),
225+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
222226
)
223227
require.NoError(t, err)
224228

‎api/integration/kubernetes/install/appinstall_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
2424
"github.com/replicatedhq/embedded-cluster/api/types"
2525
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
26+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2627
"github.com/replicatedhq/embedded-cluster/pkg/release"
2728
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2829
"github.com/stretchr/testify/assert"
@@ -76,6 +77,7 @@ func TestGetAppInstallStatus(t *testing.T) {
7677
},
7778
AppConfig: &kotsv1beta1.Config{},
7879
}),
80+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
7981
)
8082
require.NoError(t, err)
8183

@@ -117,6 +119,7 @@ func TestGetAppInstallStatus(t *testing.T) {
117119
// Create simple Kubernetes install controller
118120
installController, err := kubernetesinstall.NewInstallController(
119121
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
122+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
120123
)
121124
require.NoError(t, err)
122125

@@ -221,6 +224,7 @@ func TestPostInstallApp(t *testing.T) {
221224
},
222225
AppConfig: &kotsv1beta1.Config{},
223226
}),
227+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
224228
)
225229
require.NoError(t, err)
226230

@@ -275,6 +279,7 @@ func TestPostInstallApp(t *testing.T) {
275279
kubernetesinstall.WithStateMachine(stateMachine),
276280
kubernetesinstall.WithAppController(appController),
277281
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
282+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
278283
)
279284
require.NoError(t, err)
280285

@@ -336,6 +341,7 @@ func TestPostInstallApp(t *testing.T) {
336341
kubernetesinstall.WithStateMachine(stateMachine),
337342
kubernetesinstall.WithAppController(appController),
338343
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
344+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
339345
)
340346
require.NoError(t, err)
341347

@@ -374,6 +380,7 @@ func TestPostInstallApp(t *testing.T) {
374380
// Create simple Kubernetes install controller
375381
installController, err := kubernetesinstall.NewInstallController(
376382
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
383+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
377384
)
378385
require.NoError(t, err)
379386

@@ -448,6 +455,7 @@ func TestPostInstallApp(t *testing.T) {
448455
kubernetesinstall.WithStateMachine(stateMachine),
449456
kubernetesinstall.WithAppController(appController),
450457
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
458+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
451459
)
452460
require.NoError(t, err)
453461

@@ -525,6 +533,7 @@ func TestPostInstallApp(t *testing.T) {
525533
kubernetesinstall.WithStateMachine(stateMachine),
526534
kubernetesinstall.WithAppController(appController),
527535
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
536+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
528537
)
529538
require.NoError(t, err)
530539

@@ -603,6 +612,7 @@ func TestPostInstallApp(t *testing.T) {
603612
kubernetesinstall.WithStateMachine(stateMachine),
604613
kubernetesinstall.WithAppController(appController),
605614
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
615+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
606616
)
607617
require.NoError(t, err)
608618

‎api/integration/kubernetes/install/apppreflight_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
2323
"github.com/replicatedhq/embedded-cluster/pkg-new/kubernetesinstallation"
2424
"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
25+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2526
troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
2627
"github.com/stretchr/testify/assert"
2728
"github.com/stretchr/testify/mock"
@@ -80,6 +81,7 @@ func TestGetAppPreflightsStatus(t *testing.T) {
8081
installController, err := kubernetesinstall.NewInstallController(
8182
kubernetesinstall.WithAppController(appController),
8283
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
84+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
8385
)
8486
require.NoError(t, err)
8587

@@ -179,6 +181,7 @@ func TestGetAppPreflightsStatus(t *testing.T) {
179181
strictInstallController, err := kubernetesinstall.NewInstallController(
180182
kubernetesinstall.WithAppController(strictAppController),
181183
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
184+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
182185
)
183186
require.NoError(t, err)
184187

@@ -333,6 +336,7 @@ func TestPostRunAppPreflights(t *testing.T) {
333336
kubernetesinstall.WithStateMachine(stateMachine),
334337
kubernetesinstall.WithAppController(appController),
335338
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
339+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
336340
)
337341
require.NoError(t, err)
338342

@@ -386,6 +390,7 @@ func TestPostRunAppPreflights(t *testing.T) {
386390
kubernetesinstall.WithCurrentState(states.StateNew), // Wrong state
387391
)),
388392
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
393+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
389394
)
390395
require.NoError(t, err)
391396

@@ -433,6 +438,7 @@ func TestPostRunAppPreflights(t *testing.T) {
433438
// Create a basic install controller
434439
installController, err := kubernetesinstall.NewInstallController(
435440
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
441+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
436442
)
437443
require.NoError(t, err)
438444

‎api/integration/kubernetes/install/infra_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ func TestKubernetesPostSetupInfra(t *testing.T) {
133133
},
134134
AppConfig: &appConfig,
135135
}),
136+
kubernetesinstall.WithHelmClient(helmMock),
136137
)
137138
require.NoError(t, err)
138139

@@ -312,6 +313,7 @@ func TestKubernetesPostSetupInfra(t *testing.T) {
312313
},
313314
AppConfig: &appConfig,
314315
}),
316+
kubernetesinstall.WithHelmClient(helmMock),
315317
)
316318
require.NoError(t, err)
317319

‎api/integration/kubernetes/install/installation_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/replicatedhq/embedded-cluster/api/types"
2222
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
2323
"github.com/replicatedhq/embedded-cluster/pkg-new/kubernetesinstallation"
24+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2425
"github.com/stretchr/testify/assert"
2526
"github.com/stretchr/testify/mock"
2627
"github.com/stretchr/testify/require"
@@ -157,6 +158,7 @@ func TestKubernetesConfigureInstallation(t *testing.T) {
157158
kubernetesinstall.WithInstallation(ki),
158159
kubernetesinstall.WithStateMachine(kubernetesinstall.NewStateMachine(kubernetesinstall.WithCurrentState(states.StateApplicationConfigured))),
159160
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
161+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
160162
)
161163
require.NoError(t, err)
162164

@@ -245,6 +247,7 @@ func TestKubernetesConfigureInstallationValidation(t *testing.T) {
245247
kubernetesinstall.WithInstallation(ki),
246248
kubernetesinstall.WithStateMachine(kubernetesinstall.NewStateMachine(kubernetesinstall.WithCurrentState(states.StateApplicationConfigured))),
247249
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
250+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
248251
)
249252
require.NoError(t, err)
250253

@@ -303,6 +306,7 @@ func TestKubernetesConfigureInstallationBadRequest(t *testing.T) {
303306
kubernetesinstall.WithInstallation(ki),
304307
kubernetesinstall.WithStateMachine(kubernetesinstall.NewStateMachine(kubernetesinstall.WithCurrentState(states.StateApplicationConfigured))),
305308
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
309+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
306310
)
307311
require.NoError(t, err)
308312

@@ -387,6 +391,7 @@ func TestKubernetesGetInstallationConfig(t *testing.T) {
387391
kubernetesinstall.WithInstallation(ki),
388392
kubernetesinstall.WithInstallationManager(installationManager),
389393
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
394+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
390395
)
391396
require.NoError(t, err)
392397

@@ -452,6 +457,7 @@ func TestKubernetesGetInstallationConfig(t *testing.T) {
452457
kubernetesinstall.WithInstallation(ki),
453458
kubernetesinstall.WithInstallationManager(emptyInstallationManager),
454459
kubernetesinstall.WithReleaseData(integration.DefaultReleaseData()),
460+
kubernetesinstall.WithHelmClient(&helm.MockClient{}),
455461
)
456462
require.NoError(t, err)
457463

‎api/integration/linux/install/appconfig_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/replicatedhq/embedded-cluster/api/internal/states"
1616
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
1717
"github.com/replicatedhq/embedded-cluster/api/types"
18+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
1819
"github.com/replicatedhq/embedded-cluster/pkg/release"
1920
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
2021
"github.com/replicatedhq/kotskinds/multitype"
@@ -65,6 +66,7 @@ func TestInstallController_PatchAppConfigValuesWithAPIClient(t *testing.T) {
6566
linuxinstall.WithReleaseData(&release.ReleaseData{
6667
AppConfig: &appConfig,
6768
}),
69+
linuxinstall.WithHelmClient(&helm.MockClient{}),
6870
)
6971
require.NoError(t, err)
7072

@@ -116,6 +118,7 @@ func TestInstallController_PatchAppConfigValuesWithAPIClient(t *testing.T) {
116118
linuxinstall.WithReleaseData(&release.ReleaseData{
117119
AppConfig: &appConfig,
118120
}),
121+
linuxinstall.WithHelmClient(&helm.MockClient{}),
119122
)
120123
require.NoError(t, err)
121124

@@ -219,6 +222,7 @@ func TestInstallController_GetAppConfigValuesWithAPIClient(t *testing.T) {
219222
linuxinstall.WithReleaseData(&release.ReleaseData{
220223
AppConfig: &appConfig,
221224
}),
225+
linuxinstall.WithHelmClient(&helm.MockClient{}),
222226
)
223227
require.NoError(t, err)
224228

‎api/integration/linux/install/appinstall_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
2424
"github.com/replicatedhq/embedded-cluster/api/types"
2525
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
26+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2627
"github.com/replicatedhq/embedded-cluster/pkg/metrics"
2728
"github.com/replicatedhq/embedded-cluster/pkg/release"
2829
"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
@@ -78,6 +79,7 @@ func TestGetAppInstallStatus(t *testing.T) {
7879
},
7980
AppConfig: &kotsv1beta1.Config{},
8081
}),
82+
linuxinstall.WithHelmClient(&helm.MockClient{}),
8183
linuxinstall.WithRuntimeConfig(runtimeconfig.New(nil)),
8284
)
8385
require.NoError(t, err)
@@ -120,6 +122,7 @@ func TestGetAppInstallStatus(t *testing.T) {
120122
// Create simple Linux install controller
121123
installController, err := linuxinstall.NewInstallController(
122124
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
125+
linuxinstall.WithHelmClient(&helm.MockClient{}),
123126
)
124127
require.NoError(t, err)
125128

@@ -232,6 +235,7 @@ func TestPostInstallApp(t *testing.T) {
232235
},
233236
AppConfig: &kotsv1beta1.Config{},
234237
}),
238+
linuxinstall.WithHelmClient(&helm.MockClient{}),
235239
linuxinstall.WithRuntimeConfig(rc),
236240
)
237241
require.NoError(t, err)
@@ -292,6 +296,7 @@ func TestPostInstallApp(t *testing.T) {
292296
linuxinstall.WithStateMachine(stateMachine),
293297
linuxinstall.WithAppController(appController),
294298
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
299+
linuxinstall.WithHelmClient(&helm.MockClient{}),
295300
)
296301
require.NoError(t, err)
297302

@@ -369,6 +374,7 @@ func TestPostInstallApp(t *testing.T) {
369374
linuxinstall.WithMetricsReporter(mockMetricsReporter),
370375
linuxinstall.WithStore(mockStore),
371376
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
377+
linuxinstall.WithHelmClient(&helm.MockClient{}),
372378
linuxinstall.WithRuntimeConfig(rc),
373379
)
374380
require.NoError(t, err)
@@ -414,6 +420,7 @@ func TestPostInstallApp(t *testing.T) {
414420
// Create simple Linux install controller
415421
installController, err := linuxinstall.NewInstallController(
416422
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
423+
linuxinstall.WithHelmClient(&helm.MockClient{}),
417424
)
418425
require.NoError(t, err)
419426

@@ -488,6 +495,7 @@ func TestPostInstallApp(t *testing.T) {
488495
linuxinstall.WithStateMachine(stateMachine),
489496
linuxinstall.WithAppController(appController),
490497
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
498+
linuxinstall.WithHelmClient(&helm.MockClient{}),
491499
)
492500
require.NoError(t, err)
493501

@@ -565,6 +573,7 @@ func TestPostInstallApp(t *testing.T) {
565573
linuxinstall.WithStateMachine(stateMachine),
566574
linuxinstall.WithAppController(appController),
567575
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
576+
linuxinstall.WithHelmClient(&helm.MockClient{}),
568577
)
569578
require.NoError(t, err)
570579

@@ -643,6 +652,7 @@ func TestPostInstallApp(t *testing.T) {
643652
linuxinstall.WithStateMachine(stateMachine),
644653
linuxinstall.WithAppController(appController),
645654
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
655+
linuxinstall.WithHelmClient(&helm.MockClient{}),
646656
)
647657
require.NoError(t, err)
648658

‎api/integration/linux/install/apppreflight_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/replicatedhq/embedded-cluster/api/types"
2222
ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
2323
"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
24+
"github.com/replicatedhq/embedded-cluster/pkg/helm"
2425
"github.com/replicatedhq/embedded-cluster/pkg/release"
2526
"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
2627
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
@@ -81,6 +82,7 @@ func TestGetAppPreflightsStatus(t *testing.T) {
8182
installController, err := linuxinstall.NewInstallController(
8283
linuxinstall.WithAppController(appController),
8384
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
85+
linuxinstall.WithHelmClient(&helm.MockClient{}),
8486
)
8587
require.NoError(t, err)
8688

@@ -180,6 +182,7 @@ func TestGetAppPreflightsStatus(t *testing.T) {
180182
strictInstallController, err := linuxinstall.NewInstallController(
181183
linuxinstall.WithAppController(strictAppController),
182184
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
185+
linuxinstall.WithHelmClient(&helm.MockClient{}),
183186
)
184187
require.NoError(t, err)
185188

@@ -342,6 +345,7 @@ func TestPostRunAppPreflights(t *testing.T) {
342345
},
343346
AppConfig: &kotsv1beta1.Config{},
344347
}),
348+
linuxinstall.WithHelmClient(&helm.MockClient{}),
345349
linuxinstall.WithRuntimeConfig(rc),
346350
)
347351
require.NoError(t, err)
@@ -394,6 +398,7 @@ func TestPostRunAppPreflights(t *testing.T) {
394398
linuxinstall.WithCurrentState(states.StateNew), // Wrong state
395399
)),
396400
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
401+
linuxinstall.WithHelmClient(&helm.MockClient{}),
397402
linuxinstall.WithRuntimeConfig(rc),
398403
)
399404
require.NoError(t, err)
@@ -441,6 +446,7 @@ func TestPostRunAppPreflights(t *testing.T) {
441446
// Create a basic install controller
442447
installController, err := linuxinstall.NewInstallController(
443448
linuxinstall.WithReleaseData(integration.DefaultReleaseData()),
449+
linuxinstall.WithHelmClient(&helm.MockClient{}),
444450
)
445451
require.NoError(t, err)
446452

0 commit comments

Comments
 (0)