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.

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

[release-1.15] Upgrade eventing to latest 1.15 #4150

Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[release-1.15] Upgrade eventing to latest 1.15
Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
pierDipi committed Jan 8, 2025
commit 01bb1a2a892d4fff9c2aafa393c705b4280dabf6
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ require (
k8s.io/apiserver v0.29.2
k8s.io/client-go v0.29.2
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
knative.dev/eventing v0.42.2-0.20240923151015-7fedbd08af70
knative.dev/eventing v0.42.4-0.20241030064549-19e4c4bddaca
knative.dev/hack v0.0.0-20240704013904-b9799599afcf
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1213,8 +1213,8 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.42.2-0.20240923151015-7fedbd08af70 h1:Cf6YhPrDySVcyIqHcvBonCQpyt0hlEYJuIF9pF5zIVo=
knative.dev/eventing v0.42.2-0.20240923151015-7fedbd08af70/go.mod h1:hW5BMYcihtCelT9pqaMtK8gmNOo1ybxcigjBY+/fU+k=
knative.dev/eventing v0.42.4-0.20241030064549-19e4c4bddaca h1:i5PgRTbxNX1u7CnrWnQFFV0eGky09pU14NHzeacWwPY=
knative.dev/eventing v0.42.4-0.20241030064549-19e4c4bddaca/go.mod h1:hW5BMYcihtCelT9pqaMtK8gmNOo1ybxcigjBY+/fU+k=
knative.dev/hack v0.0.0-20240704013904-b9799599afcf h1:n92FmZRywgtHso7pFAku7CW0qvRAs1hXtMQqO0R6eiE=
knative.dev/hack v0.0.0-20240704013904-b9799599afcf/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
3 changes: 3 additions & 0 deletions vendor/knative.dev/eventing/pkg/auth/serviceaccount.go
Original file line number Diff line number Diff line change
@@ -109,6 +109,9 @@ func EnsureOIDCServiceAccountExistsForResource(ctx context.Context, serviceAccou
return fmt.Errorf("service account %s not owned by %s %s", sa.Name, gvk.Kind, objectMeta.Name)
}

// DeepDerivative does not understand default metav1.Time{} as an empty value
expected.CreationTimestamp = sa.CreationTimestamp

if !equality.Semantic.DeepDerivative(expected, sa) {
expected.ResourceVersion = sa.ResourceVersion

253 changes: 50 additions & 203 deletions vendor/knative.dev/eventing/pkg/scheduler/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/pkg/scheduler/doc.go
Original file line number Diff line number Diff line change
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// The scheduler is responsible for placing virtual pod (VPod) replicas within real pods.
// Package scheduler is responsible for placing virtual pod (VPod) replicas within real pods.
package scheduler
88 changes: 0 additions & 88 deletions vendor/knative.dev/eventing/pkg/scheduler/factory/registry.go

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/knative.dev/eventing/pkg/scheduler/placement.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ limitations under the License.
package scheduler

import (
"k8s.io/apimachinery/pkg/util/sets"
duckv1alpha1 "knative.dev/eventing/pkg/apis/duck/v1alpha1"
)

@@ -29,24 +28,3 @@ func GetTotalVReplicas(placements []duckv1alpha1.Placement) int32 {
}
return r
}

// GetPlacementForPod returns the placement corresponding to podName
func GetPlacementForPod(placements []duckv1alpha1.Placement, podName string) *duckv1alpha1.Placement {
for i := 0; i < len(placements); i++ {
if placements[i].PodName == podName {
return &placements[i]
}
}
return nil
}

// GetPodCount returns the number of pods with the given placements
func GetPodCount(placements []duckv1alpha1.Placement) int {
set := sets.NewString()
for _, p := range placements {
if p.VReplicas > 0 {
set.Insert(p.PodName)
}
}
return set.Len()
}

This file was deleted.

This file was deleted.

Loading