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

fix: resolve the failing e2e appset tests for ksonnet applications #21580

Merged
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
2 changes: 0 additions & 2 deletions test/e2e/applicationset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,6 @@ func TestSimpleGitDirectoryGenerator(t *testing.T) {
expectedApps := []v1alpha1.Application{
generateExpectedApp("kustomize-guestbook"),
generateExpectedApp("helm-guestbook"),
generateExpectedApp("ksonnet-guestbook"),
}

var expectedAppsNewNamespace []v1alpha1.Application
Expand Down Expand Up @@ -1269,7 +1268,6 @@ func TestSimpleGitDirectoryGeneratorGoTemplate(t *testing.T) {
expectedApps := []v1alpha1.Application{
generateExpectedApp("kustomize-guestbook"),
generateExpectedApp("helm-guestbook"),
generateExpectedApp("ksonnet-guestbook"),
}

var expectedAppsNewNamespace []v1alpha1.Application
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/matrix_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ func TestListMatrixGenerator(t *testing.T) {
expectedApps := []v1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),

generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

var expectedAppsNewNamespace []v1alpha1.Application
Expand Down Expand Up @@ -169,11 +167,9 @@ func TestClusterMatrixGenerator(t *testing.T) {
expectedApps := []v1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),

generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

var expectedAppsNewNamespace []v1alpha1.Application
Expand Down Expand Up @@ -297,12 +293,10 @@ func TestMatrixTerminalMatrixGeneratorSelector(t *testing.T) {
expectedApps1 := []v1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook"),
generateExpectedApp("cluster1", "helm-guestbook"),
generateExpectedApp("cluster1", "ksonnet-guestbook"),
}
expectedApps2 := []v1alpha1.Application{
generateExpectedApp("cluster2", "kustomize-guestbook"),
generateExpectedApp("cluster2", "helm-guestbook"),
generateExpectedApp("cluster2", "ksonnet-guestbook"),
}

Given(t).
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/merge_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,9 @@ func TestClusterMergeGenerator(t *testing.T) {
expectedApps := []v1alpha1.Application{
generateExpectedApp("cluster1", "kustomize-guestbook", "1"),
generateExpectedApp("cluster1", "helm-guestbook", "0"),
generateExpectedApp("cluster1", "ksonnet-guestbook", "0"),

generateExpectedApp("cluster2", "kustomize-guestbook", "0"),
generateExpectedApp("cluster2", "helm-guestbook", "2"),
generateExpectedApp("cluster2", "ksonnet-guestbook", "0"),
}

var expectedAppsNewNamespace []v1alpha1.Application
Expand Down
Loading