upgrade to latest dependencies (#1049)

knative-automation · web-flow · commit bc5f4befde5e · 2023-01-26T14:27:40.000Z
bumping knative.dev/eventing 1f9f4d3...4d6e1fc:
  &gt; 4d6e1fc Change subscription patch logic to ensure resource version (# 6670)
  &gt; 74e165a APIServerSource with selector to target namespaces (# 6665)

Signed-off-by: Knative Automation &lt;automation@knative.team&gt;

Signed-off-by: Knative Automation &lt;automation@knative.team&gt;
diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	k8s.io/client-go v0.25.4
 	k8s.io/code-generator v0.25.4
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
-	knative.dev/eventing v0.35.1-0.20230125080738-1f9f4d37aa56
+	knative.dev/eventing v0.36.0
 	knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9
 	knative.dev/pkg v0.0.0-20230117181655-247510c00e9d
 	knative.dev/reconciler-test v0.0.0-20230123181139-476a442e3644
diff --git a/go.sum b/go.sum
@@ -1054,8 +1054,8 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI
 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/eventing v0.35.1-0.20230125080738-1f9f4d37aa56 h1:aBxfcRszMz6Ey6IgNVrEeDrkhApAeV8TV09qq95JtU4=
-knative.dev/eventing v0.35.1-0.20230125080738-1f9f4d37aa56/go.mod h1:Qka5Z6+LeMoHGL1QAznVdmq5LAu21b4F3rgxc2AMgRg=
+knative.dev/eventing v0.36.0 h1:a7kamc2S+LcpNMDX3llnwZm+DqMcYSXgKIgJXdaQQSY=
+knative.dev/eventing v0.36.0/go.mod h1:Qka5Z6+LeMoHGL1QAznVdmq5LAu21b4F3rgxc2AMgRg=
 knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9 h1:CDa7s9KspEZqPhk7cN68ZypRLuAvSgr+knoOaXSsrHk=
 knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
 knative.dev/pkg v0.0.0-20230117181655-247510c00e9d h1:pjKDcvHoMib8nRp56eISRmMj/pFMzJljnzvMvGCIReI=
diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go
@@ -80,6 +80,11 @@ type ApiServerSourceSpec struct {
 	// source. Defaults to default if not set.
 	// +optional
 	ServiceAccountName string `json:"serviceAccountName,omitempty"`
+
+	// NamespaceSelector is a label selector to capture the namespaces that
+	// should be watched by the source.
+	// +optional
+	NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"`
 }
 
 // ApiServerSourceStatus defines the observed state of ApiServerSource
@@ -92,6 +97,9 @@ type ApiServerSourceStatus struct {
 	// * SinkURI - the current active sink URI that has been configured for the
 	//   Source.
 	duckv1.SourceStatus `json:",inline"`
+
+	// Namespaces show the namespaces currently watched by the ApiServerSource
+	Namespaces []string `json:"namespaces"`
 }
 
 // APIVersionKind is an APIVersion and Kind tuple.
diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go
diff --git a/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/apiserversouce.go b/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/apiserversouce.go
@@ -111,7 +111,7 @@ func WithApiServerSourceSufficientPermissions(s *v1.ApiServerSource) {
 }
 
 func WithApiServerSourceNoSufficientPermissions(s *v1.ApiServerSource) {
-	s.Status.MarkNoSufficientPermissions("", `User system:serviceaccount:testnamespace:default cannot get, list, watch resource "namespaces" in API group ""`)
+	s.Status.MarkNoSufficientPermissions("", `User system:serviceaccount:testnamespace:default cannot get, list, watch resource "namespaces" in API group "" in Namespace "testnamespace"`)
 }
 
 func WithApiServerSourceDeleted(c *v1.ApiServerSource) {
@@ -136,3 +136,15 @@ func WithApiServerSourceObjectMetaGeneration(generation int64) ApiServerSourceOp
 		c.ObjectMeta.Generation = generation
 	}
 }
+
+func WithApiServerSourceNamespaceSelector(nsSelector metav1.LabelSelector) ApiServerSourceOption {
+	return func(c *v1.ApiServerSource) {
+		c.Spec.NamespaceSelector = &nsSelector
+	}
+}
+
+func WithApiServerSourceStatusNamespaces(namespaces []string) ApiServerSourceOption {
+	return func(c *v1.ApiServerSource) {
+		c.Status.Namespaces = namespaces
+	}
+}
diff --git a/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/subscription.go b/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/subscription.go
@@ -250,6 +250,12 @@ func MarkNotAddedToChannel(reason, msg string) SubscriptionOption {
 	}
 }
 
+func MarkChannelFailed(reason, msg string) SubscriptionOption {
+	return func(s *v1.Subscription) {
+		s.Status.MarkChannelFailed(reason, msg)
+	}
+}
+
 func MarkReferencesResolved(s *v1.Subscription) {
 	s.Status.MarkReferencesResolved()
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1221,7 +1221,7 @@ k8s.io/utils/net
 k8s.io/utils/pointer
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# knative.dev/eventing v0.35.1-0.20230125080738-1f9f4d37aa56
+# knative.dev/eventing v0.36.0
 ## explicit; go 1.18
 knative.dev/eventing/pkg/adapter/v2
 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func WithApiServerSourceSufficientPermissions(s *v1.ApiServerSource) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func WithApiServerSourceNoSufficientPermissions(s *v1.ApiServerSource) {`
`114`		- s.Status.MarkNoSufficientPermissions("", `User system:serviceaccount:testnamespace:default cannot get, list, watch resource "namespaces" in API group ""`)
	`114`	+ s.Status.MarkNoSufficientPermissions("", `User system:serviceaccount:testnamespace:default cannot get, list, watch resource "namespaces" in API group "" in Namespace "testnamespace"`)
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`func WithApiServerSourceDeleted(c *v1.ApiServerSource) {`
`@@ -136,3 +136,15 @@ func WithApiServerSourceObjectMetaGeneration(generation int64) ApiServerSourceOp`
`136`	`136`	`c.ObjectMeta.Generation = generation`
`137`	`137`	`}`
`138`	`138`	`}`
	`139`	`+`
	`140`	`+func WithApiServerSourceNamespaceSelector(nsSelector metav1.LabelSelector) ApiServerSourceOption {`
	`141`	`+ return func(c *v1.ApiServerSource) {`
	`142`	`+ c.Spec.NamespaceSelector = &nsSelector`
	`143`	`+ }`
	`144`	`+}`
	`145`	`+`
	`146`	`+func WithApiServerSourceStatusNamespaces(namespaces []string) ApiServerSourceOption {`
	`147`	`+ return func(c *v1.ApiServerSource) {`
	`148`	`+ c.Status.Namespaces = namespaces`
	`149`	`+ }`
	`150`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,12 @@ func MarkNotAddedToChannel(reason, msg string) SubscriptionOption {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
	`253`	`+func MarkChannelFailed(reason, msg string) SubscriptionOption {`
	`254`	`+ return func(s *v1.Subscription) {`
	`255`	`+ s.Status.MarkChannelFailed(reason, msg)`
	`256`	`+ }`
	`257`	`+}`
	`258`	`+`
`253`	`259`	`func MarkReferencesResolved(s *v1.Subscription) {`
`254`	`260`	`s.Status.MarkReferencesResolved()`
`255`	`261`	`}`