Skip to content

[release-v1.10] sync upstream deps#378

Merged
openshift-ci[bot] merged 4 commits into
openshift-knative:release-v1.10from
matzew:cve-1-10-godeps_ocp
Oct 13, 2023
Merged

[release-v1.10] sync upstream deps#378
openshift-ci[bot] merged 4 commits into
openshift-knative:release-v1.10from
matzew:cve-1-10-godeps_ocp

Conversation

@matzew
Copy link
Copy Markdown
Member

@matzew matzew commented Oct 12, 2023

Basically, this PR runs:

 ./hack/update-deps.sh --upgrade --release 1.10

@matzew
Run ./hack/update-deps.sh --upgrade --release 1.10
adf9e6b 
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@openshift-ci openshift-ci Bot requested review from aliok and lberk October 12, 2023 13:32
pierDipi
pierDipi reviewed Oct 12, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@pierDipi pierDipi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to re-apply the vendor patches

@matzew
Copy link
Copy Markdown
Member Author

matzew commented Oct 12, 2023 •
edited
Loading

You need to re-apply the vendor patches

MAKE RELEASE=1.11 is not giving me any diff

matzew
matzew commented Oct 12, 2023
View reviewed changes
Comment thread vendor/knative.dev/pkg/controller/stats_reporter.go
@@ -199,7 +199,7 @@ func (r *reporter) ReportReconcile(duration time.Duration, success string, key t
return err
}

// TODO skonto: fix latency histogram
Copy link
Copy Markdown
Member Author

@matzew matzew Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be removed ...

/hold

matzew added 3 commits October 12, 2023 18:00
@matzew
Manually applying a few patches
95a07d6 
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew
Remove unused vendor patch (since we got update to proper via:openshi…
2c0e040 
…ft-knative#306 )

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew
Remove patch since the patched version is now matching the actual. via:…
2d91cad 
…openshift-knative#306

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew
Copy link
Copy Markdown
Member Author

matzew commented Oct 12, 2023

OK... the relevant patches are:

./018-rekt-test-override-kopublish.patch
./020-mutemetrics.patch
./005-k8s-min.patch

the other two patching vendor/knative, are no longer needed , since updated here to "proper" #306

@matzew
Copy link
Copy Markdown
Member Author

matzew commented Oct 13, 2023

/unhold

pierDipi
pierDipi approved these changes Oct 13, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@pierDipi pierDipi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm label Oct 13, 2023
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot merged commit ff87ef4 into openshift-knative:release-v1.10 Oct 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pierDipi pierDipi pierDipi approved these changes

@aliok aliok Awaiting requested review from aliok

@lberk lberk Awaiting requested review from lberk

Assignees

@pierDipi pierDipi

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@matzew @pierDipi