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.

Sign up for GitHub

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

Jump to bottom

Undo the template duplication check update #90

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Undo the template duplication check update #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions controllers/templatesync/template_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,9 +1556,6 @@ func hasDupName(pol *policiesv1.Policy) bool {
}

name := unstructured.GetName()
apiv := unstructured.GetAPIVersion()
kind := unstructured.GetKind()
name = fmt.Sprintf("%s/%s/%s", name, apiv, kind)

if _, has := foundNames[name]; has {
return true
Expand Down
10 changes: 5 additions & 5 deletions controllers/templatesync/template_sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestHasDuplicateNames(t *testing.T) {

has := hasDupName(&policy)
if has {
t.Fatal("Duplicate names found in templates but not expected")
t.Fatal("Unexpected duplicate policy template names")
}

// add a gatekeeper constraint template with a duplicate name
Expand Down Expand Up @@ -161,8 +161,8 @@ func TestHasDuplicateNames(t *testing.T) {
policy.Spec.PolicyTemplates = append(policy.Spec.PolicyTemplates, &y)

has = hasDupName(&policy)
if has {
t.Fatal("Duplicate names found in templates but not expected")
if !has {
t.Fatal("Duplicate names for templates not detected")
}

// add a gatekeeper constraint with a duplicate name
Expand Down Expand Up @@ -190,8 +190,8 @@ func TestHasDuplicateNames(t *testing.T) {
policy.Spec.PolicyTemplates = append(policy.Spec.PolicyTemplates, &z)

has = hasDupName(&policy)
if has {
t.Fatal("Duplicate names found in templates but not expected")
if !has {
t.Fatal("Duplicate names for templates not detected")
}

// add a config policy with a duplicate name
Expand Down