upgrade to latest dependencies

bumping knative.dev/pkg 28b58b8...c4843b7: > c4843b7 Give users the ability to disable namespace ownership of webhook configurations (# 3095) bumping knative.dev/eventing 641cbb7...e7fca76: > e7fca76 Add Istio inject label (# 8205) bumping knative.dev/reconciler-test 1fee6ba...87d8570: > 87d8570 Use istio inject label (# 762) Signed-off-by: Knative Automation <[email protected]>
knative-extensions · Sep 26, 2024 · 6df222e · 6df222e
1 parent f8db152
commit 6df222e
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -10,10 +10,10 @@ require (
 	k8s.io/api v0.30.3
 	k8s.io/apimachinery v0.30.3
 	k8s.io/client-go v0.30.3
-	knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2
+	knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a
 	knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
-	knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a
-	knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7
+	knative.dev/pkg v0.0.0-20240926013127-c4843b746d24
+	knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -801,14 +801,14 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2 h1:Mju6ncF1Aae3HwZ7HH+++1s7O+NQYFi40m+/lOGiBVc=
-knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2/go.mod h1:CguA8wPeeeED9ZIAJ+NqCo8fGj1W3gkEvTQs7Enk/oo=
+knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a h1:HnJ8kus8avX0oMuzA1K3mKKV+mZJ32kJGqvtIYcoeEw=
+knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a/go.mod h1:CguA8wPeeeED9ZIAJ+NqCo8fGj1W3gkEvTQs7Enk/oo=
 knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d h1:mgROhGJG3+g0SBkaG4Y2HxrIOLN3ZZcN4+IFZla+Zqs=
 knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
-knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a h1:AFR8PmM3le4Uf58XRJzj0Z/ajyCUriqebCk6hyc0M6g=
-knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a/go.mod h1:IQi7fVFvQa6UpNnSpzlAiNPMtTvIj4MHj4vSD/PulCE=
-knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7 h1:cOWObcgQx26mGKsSnacKgnIOZFqkgVdeGqoVh9QDrRs=
-knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7/go.mod h1:PXOqfSSDHzaVPXrpEPlxsOSQRIQJGnSrj2IuVQh3Kas=
+knative.dev/pkg v0.0.0-20240926013127-c4843b746d24 h1:NJLvfA38IlzdSxNi5//yEpKeZBPezyQZA4SCcoMjC9o=
+knative.dev/pkg v0.0.0-20240926013127-c4843b746d24/go.mod h1:IQi7fVFvQa6UpNnSpzlAiNPMtTvIj4MHj4vSD/PulCE=
+knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042 h1:iex7NiH53E+EDGdC7ekbr3YL0qVlONHvZOYLra76y1Y=
+knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042/go.mod h1:PXOqfSSDHzaVPXrpEPlxsOSQRIQJGnSrj2IuVQh3Kas=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml
@@ -19,6 +19,9 @@ metadata:
   namespace: {{ .namespace }}
   labels:
     app: eventshub-{{ .name }}
+    {{ range $key, $value := .labels }}
+    {{ $key }}: "{{ $value }}"
+    {{ end }}
   {{ if .annotations }}
   annotations:
     {{ range $key, $value := .annotations }}

diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/104-forwarder.yaml b/vendor/knative.dev/reconciler-test/pkg/eventshub/104-forwarder.yaml
@@ -25,12 +25,20 @@ metadata:
   {{ end }}
 spec:
   template:
-    {{ if .podannotations }}
+    {{ if or .podannotations .podlabels }}
     metadata:
+      {{ if .podannotations }}
       annotations:
         {{ range $key, $value := .podannotations }}
           {{ $key }}: "{{ $value }}"
-          {{ end }}
+        {{ end }}
+      {{ end }}
+      {{ if .podlabels }}
+      labels:
+        {{ range $key, $value := .podlabels }}
+          {{ $key }}: "{{ $value }}"
+        {{ end }}
+      {{ end }}
     {{ end }}
     spec:
       serviceAccountName: "{{ .name }}"

diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go b/vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go
@@ -168,6 +168,7 @@ func Install(name string, options ...EventsHubOption) feature.StepFn {
 
 		if ic := environment.GetIstioConfig(ctx); ic.Enabled {
 			manifest.WithIstioPodAnnotations(cfg)
+			manifest.WithIstioPodLabels(cfg)
 		}
 
 		manifest.PodSecurityCfgFn(ctx, t)(cfg)

diff --git a/vendor/knative.dev/reconciler-test/pkg/manifest/options.go b/vendor/knative.dev/reconciler-test/pkg/manifest/options.go
@@ -63,6 +63,21 @@ func WithPodAnnotations(additional map[string]interface{}) CfgFn {
 	}
 }
 
+// WithPodLabels appends pod labels (usually used by types where pod template is embedded)
+func WithPodLabels(additional map[string]string) CfgFn {
+	return func(cfg map[string]interface{}) {
+		if ann, ok := cfg["podlabels"]; ok {
+			m := make(map[string]interface{}, len(additional))
+			for k, v := range additional {
+				m[k] = v
+			}
+			appendToOriginal(ann, m)
+			return
+		}
+		cfg["podlabels"] = additional
+	}
+}
+
 func appendToOriginal(original interface{}, additional map[string]interface{}) {
 	annotations := original.(map[string]interface{})
 	for k, v := range additional {
@@ -92,3 +107,12 @@ func WithIstioPodAnnotations(cfg map[string]interface{}) {
 	WithAnnotations(podAnnotations)(cfg)
 	WithPodAnnotations(podAnnotations)(cfg)
 }
+
+func WithIstioPodLabels(cfg map[string]interface{}) {
+	podLabels := map[string]string{
+		"sidecar.istio.io/inject": "true",
+	}
+
+	WithLabels(podLabels)(cfg)
+	WithPodLabels(podLabels)(cfg)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -988,7 +988,7 @@ k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2
+# knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a
 ## explicit; go 1.22.0
 knative.dev/eventing/hack
 knative.dev/eventing/pkg/apis
@@ -1088,7 +1088,7 @@ knative.dev/eventing/pkg/utils
 # knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
 ## explicit; go 1.21
 knative.dev/hack
-# knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a
+# knative.dev/pkg v0.0.0-20240926013127-c4843b746d24
 ## explicit; go 1.22.0
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1147,7 +1147,7 @@ knative.dev/pkg/tracing/config
 knative.dev/pkg/tracing/propagation
 knative.dev/pkg/tracing/propagation/tracecontextb3
 knative.dev/pkg/tracker
-# knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7
+# knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042
 ## explicit; go 1.22.0
 knative.dev/reconciler-test/cmd/eventshub
 knative.dev/reconciler-test/pkg/environment