Skip to content

Commit

Permalink
test(e2e): squash helm tests (backport of #11901) (#12310)
Browse files Browse the repository at this point in the history
Automatic cherry-pick of #11901 for branch release-2.6

Generated by
[action](https://github.com/kumahq/kuma/actions/runs/12375804596)

cherry-picked commit a649d8e
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!
⚠️ ⚠️ ⚠️
```
On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit a649d8e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e/bootstrap/corefile_template.go
	deleted:    test/e2e/helm/kuma_helm_deploy_multi_apps.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/helm/e2e_suite_test.go

```

---------

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
Co-authored-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Co-authored-by: Lukasz Dziedziak <lukidzi@gmail.com>
  • Loading branch information
3 people authored Dec 17, 2024
1 parent e8a02b2 commit d42c5d7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 88 deletions.
8 changes: 8 additions & 0 deletions test/e2e/bootstrap/corefile_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package bootstrap

import (
"fmt"
"strconv"
"strings"

"github.com/gruntwork-io/terratest/modules/random"
Expand Down Expand Up @@ -35,6 +36,7 @@ data:
}

dnsConfigDir := "/tmp/kuma-dp-config/coredns"
minReplicas := 3
BeforeAll(func() {
k8sCluster = NewK8sCluster(NewTestingT(), Kuma1, Silent)

Expand All @@ -49,6 +51,8 @@ data:
WithHelmOpt("controlPlane.extraConfigMaps[0].name", configMapName),
WithHelmOpt("controlPlane.extraConfigMaps[0].mountPath", dnsConfigDir),
WithHelmOpt("controlPlane.extraConfigMaps[0].readonly", "false"),
WithHelmOpt("controlPlane.autoscaling.enabled", "true"),
WithHelmOpt("controlPlane.autoscaling.minReplicas", strconv.Itoa(minReplicas)),
)).
Install(MeshKubernetes("default")).
Install(NamespaceWithSidecarInjection(appNamespace)).
Expand All @@ -69,6 +73,10 @@ data:
Expect(k8sCluster.DismissCluster()).To(Succeed())
})

It("should deploy 3 CP replicas", func() {
Expect(k8sCluster.WaitApp(Config.KumaServiceName, Config.KumaNamespace, minReplicas)).To(Succeed())
})

It("should use Corefile template from control plane at data plane", func() {
dpPod, err := PodNameOfApp(k8sCluster, appName, appNamespace)
Expect(err).ToNot(HaveOccurred())
Expand Down
1 change: 0 additions & 1 deletion test/e2e/helm/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var (
// Skipped as it fails with: error while running command: exit status 1; Error: INSTALLATION FAILED: rendered manifests contain a resource that already exists. Unable to continue with install: ServiceAccount "kuma-control-plane" in namespace "kuma-system" exists and cannot be imported into the current release: invalid ownership metadata; annotation validation error: key "meta.helm.sh/release-name" must equal "kuma-c0vo8o": current value is "kuma-8yy3uv"
// Likely something needs to be improved to be able to run this test
_ = PDescribe("Test Global and Zone universal mode with Helm chart", Label("job-0"), helm.GlobalAndZoneInUniversalModeWithHelmChart, Ordered)
_ = Describe("Test App deployment with Helm chart", Label("job-2"), helm.AppDeploymentWithHelmChart)
_ = Describe("Test upgrading Standalone with Helm chart", Label("job-2"), helm.UpgradingWithHelmChartStandalone, Ordered)
_ = Describe("Test upgrading Multizone with Helm chart", Label("job-2"), helm.UpgradingWithHelmChartMultizone, Ordered)
)
87 changes: 0 additions & 87 deletions test/e2e/helm/kuma_helm_deploy_multi_apps.go

This file was deleted.

0 comments on commit d42c5d7

Please sign in to comment.