diff --git a/apptests/appscenarios/karma.go b/apptests/appscenarios/karma.go index c0b9e726d3..4da6c0fd52 100644 --- a/apptests/appscenarios/karma.go +++ b/apptests/appscenarios/karma.go @@ -70,21 +70,3 @@ func (k karma) install(ctx context.Context, env *environment.Env, appPath string return err } - -func (k karma) ApplyTraefikOverrideCM(ctx context.Context, env *environment.Env, cmName string) error { - testDataPath, err := getTestDataDir() - if err != nil { - return err - } - cmPath := filepath.Join(testDataPath, "traefik", "override-cm.yaml") - err = env.ApplyYAML(ctx, cmPath, map[string]string{ - "name": cmName, - "namespace": kommanderNamespace, - }) - if err != nil { - return err - } - - return nil - -} diff --git a/apptests/appscenarios/karma_test.go b/apptests/appscenarios/karma_test.go index e45e306ddb..57ea3b4525 100644 --- a/apptests/appscenarios/karma_test.go +++ b/apptests/appscenarios/karma_test.go @@ -382,10 +382,8 @@ func installKarmaDependencies(k *karma) { Expect(err).To(BeNil()) By("should install traefik") - // TODO: use traefik object to install - err = k.ApplyTraefikOverrideCM(ctx, env, traefikOverrideCMName) - Expect(err).To(BeNil()) - err = k.InstallDependency(ctx, env, constants.Traefik) + tfk := NewTraefik() + err = tfk.Install(ctx, env) Expect(err).To(BeNil()) hr = &fluxhelmv2beta2.HelmRelease{ @@ -394,21 +392,11 @@ func installKarmaDependencies(k *karma) { APIVersion: fluxhelmv2beta2.GroupVersion.Version, }, ObjectMeta: metav1.ObjectMeta{ - Name: constants.Traefik, + Name: tfk.Name(), Namespace: kommanderNamespace, }, } - // override traefik values.yaml - err = k8sClient.Get(ctx, ctrlClient.ObjectKeyFromObject(hr), hr) - Expect(err).To(BeNil()) - hr.Spec.ValuesFrom = append(hr.Spec.ValuesFrom, fluxhelmv2beta2.ValuesReference{ - Kind: "ConfigMap", - Name: traefikOverrideCMName, - }) - err = k8sClient.Update(ctx, hr) - Expect(err).To(BeNil()) - Eventually(func() error { err = k8sClient.Get(ctx, ctrlClient.ObjectKeyFromObject(hr), hr) if err != nil {