Skip to content

Commit 2318c63

Browse files
authoredApr 29, 2021
Add 'knative.dev' to include/exclude labels (vmware-tanzu#131)
Workaround for an upstream knative issue that cause corruption within the mutating webhook configuration for intercepting bound applications. Refs vmware-tanzu#130 Signed-off-by: Scott Andrews <andrewssc@vmware.com>
1 parent 14f65d4 commit 2318c63

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed
 

‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"cSpell.enabled": true
3+
}

‎cmd/labs-service-bindings-manager/main.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@ import (
3737
)
3838

3939
var (
40+
// TODO(scothis) restore labels after https://github.com/vmware-labs/service-bindings/issues/130
4041
//BindingExcludeLabel can be applied to exclude resource from webhook
41-
BindingExcludeLabel = "bindings.labs.vmware.com/exclude"
42+
// BindingExcludeLabel = "bindings.labs.vmware.com/exclude"
43+
BindingExcludeLabel = "knative.dev.bindings.labs.vmware.com/exclude"
4244
//BindingIncludeLabel can be applied to include resource in webhook
43-
BindingIncludeLabel = "bindings.labs.vmware.com/include"
45+
// BindingIncludeLabel = "bindings.labs.vmware.com/include"
46+
BindingIncludeLabel = "knative.dev.bindings.labs.vmware.com/include"
4447

4548
ExclusionSelector = metav1.LabelSelector{
4649
MatchExpressions: []metav1.LabelSelectorRequirement{{

‎config/100-namespace.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ metadata:
77
name: service-bindings
88
labels:
99
bindings.labs.vmware.com/release: devel
10-
bindings.labs.vmware.com/exclude: "true"
10+
knative.dev.bindings.labs.vmware.com/exclude: "true"

‎config/manager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
namespace: service-bindings
99
labels:
1010
bindings.labs.vmware.com/release: devel
11-
bindings.labs.vmware.com/exclude: "true"
11+
knative.dev.bindings.labs.vmware.com/exclude: "true"
1212
spec:
1313
replicas: 1
1414
selector:
@@ -23,7 +23,7 @@ spec:
2323
app: manager
2424
role: manager
2525
bindings.labs.vmware.com/release: devel
26-
bindings.labs.vmware.com/exclude: "true"
26+
knative.dev.bindings.labs.vmware.com/exclude: "true"
2727
spec:
2828
serviceAccountName: controller
2929
containers:

0 commit comments

Comments
 (0)