Skip to content

Commit 9c113c6

Browse files
committed
tweak logging and fail fast
1 parent 10135da commit 9c113c6

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

test/e2e-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fi
8181
for i in {1..20}; do
8282
export TEST_RUN=$i
8383
toggle_feature allow-zero-initial-scale true config-autoscaler || fail_test
84-
go_test_e2e -timeout=2m ./test/e2e/initscale "${E2E_TEST_FLAGS[@]}" || failed=1
84+
go_test_e2e -timeout=2m ./test/e2e/initscale "${E2E_TEST_FLAGS[@]}" || fail_test
8585
toggle_feature allow-zero-initial-scale false config-autoscaler || fail_test
8686
done
8787

vendor/knative.dev/pkg/configmap/informer/informed_watcher.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"k8s.io/client-go/kubernetes"
3434
"k8s.io/client-go/tools/cache"
3535
"knative.dev/pkg/configmap"
36+
"knative.dev/pkg/kmap"
3637
)
3738

3839
// NewInformedWatcherFromFactory watches a Kubernetes namespace for ConfigMap changes.
@@ -223,7 +224,8 @@ func (i *InformedWatcher) addConfigMapEvent(obj interface{}) {
223224
i.OnChange(configMap)
224225

225226
if i.Logger != nil {
226-
i.Logger.Warnf("config map %q added: %#v", configMap)
227+
data := kmap.ExcludeKeyList(configMap.Data, []string{"_example"})
228+
i.Logger.Warnf("config map %q added: %#v", configMap.Name, data)
227229
}
228230
}
229231

@@ -240,7 +242,8 @@ func (i *InformedWatcher) updateConfigMapEvent(o, n interface{}) {
240242
}
241243

242244
if i.Logger != nil {
243-
i.Logger.Warnf("config map %q updated: %#v", configMap)
245+
data := kmap.ExcludeKeyList(configMap.Data, []string{"_example"})
246+
i.Logger.Warnf("config map %q updated: %#v", configMap.Name, data)
244247
}
245248
i.OnChange(configMap)
246249
}
@@ -262,7 +265,8 @@ func (i *InformedWatcher) deleteConfigMapEvent(obj interface{}) {
262265
}
263266

264267
if i.Logger != nil {
265-
i.Logger.Warnf("config map %q deleted: %#v", configMap)
268+
data := kmap.ExcludeKeyList(configMap.Data, []string{"_example"})
269+
i.Logger.Warnf("config map %q deleted: %#v", configMap.Name, data)
266270
}
267271

268272
if def, ok := i.defaults[configMap.Name]; ok {

0 commit comments

Comments
 (0)