Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(e2e): squash helm tests (backport of #11901) #12310

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.