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

Bug 1877960: [release-4.5] router-secrets: set named certificates to empty array instead of nil when none found #342

Merged
merged 2 commits into from Sep 17, 2020
Merged

Bug 1877960: [release-4.5] router-secrets: set named certificates to empty array instead of nil when none found #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
961ee30
router-secrets: set named certificates to empty array instead of nil …
stlaz Jun 5, 2020
e5454a4
don't cache e2e tests
stlaz Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@ GO_TEST_PACKAGES :=./pkg/... ./cmd/...
# make test-e2e
test-e2e: GO_TEST_PACKAGES :=./test/e2e/...
test-e2e: GO_TEST_FLAGS += -v
test-e2e: GO_TEST_FLAGS += -count 1
test-e2e: test-unit
.PHONY: test-e2e

Expand Down
4 changes: 2 additions & 2 deletions pkg/operator2/configobservation/routersecret/observe_router_secret.go
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ func ObserveRouterSecret(genericlisters configobserver.Listers, recorder events.
}

observedConfig := map[string]interface{}{}
if err := unstructured.SetNestedField(
if err := unstructured.SetNestedSlice(
observedConfig,
observedNamedCertificates,
namedCertificatesPath...,
Expand All @@ -54,7 +54,7 @@ func ObserveRouterSecret(genericlisters configobserver.Listers, recorder events.
}

func routerSecretToSNI(routerSecret *corev1.Secret) ([]interface{}, error) {
var certs []interface{}
certs := []interface{}{}
// make sure the output slice of named certs is sorted by domain so that the generated config is deterministic
for _, domain := range sets.StringKeySet(routerSecret.Data).List() {
certs = append(certs, map[string]interface{}{
Expand Down