Skip to content

Conversation

@nak3
Copy link

@nak3 nak3 commented Nov 29, 2022

Cherry-pick of knative@92f942c

/cc @skonto

knative#13506)

The autoscaler sends a probe to detect the activator is in the data
path. This probe was inadvertently passed to the user container which
was preventing scale to 0.

Co-authored-by: dprotaso <dprotaso@gmail.com>
@openshift-ci openshift-ci bot requested a review from skonto November 29, 2022 13:35
@skonto
Copy link

skonto commented Nov 29, 2022

/lgtm
/hold for tests

@openshift-ci
Copy link

openshift-ci bot commented Nov 29, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nak3, skonto

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

@skonto
Copy link

skonto commented Nov 29, 2022

Thank you! Let's cherry-pick on the other branches too.

@nak3
Copy link
Author

nak3 commented Nov 30, 2022

/hold cancel

@nak3
Copy link
Author

nak3 commented Nov 30, 2022

/cherry-pick release-v1.7

@openshift-cherrypick-robot

@nak3: once the present PR merges, I will cherry-pick it on top of release-v1.7 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-v1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nak3
Copy link
Author

nak3 commented Nov 30, 2022

/cherry-pick release-v1.6

@openshift-cherrypick-robot

@nak3: once the present PR merges, I will cherry-pick it on top of release-v1.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-v1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nak3
Copy link
Author

nak3 commented Nov 30, 2022

/cherry-pick release-v1.8

@openshift-cherrypick-robot

@nak3: once the present PR merges, I will cherry-pick it on top of release-v1.8 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-v1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot merged commit 7fa2326 into openshift-knative:release-v1.5 Nov 30, 2022
@openshift-cherrypick-robot

@nak3: #46 failed to apply on top of branch "release-v1.7":

Applying: Ensure probes from the autoscaler are not passed to the user-container (#13506)
Using index info to reconstruct a base tree...
M	cmd/queue/main.go
M	test/e2e/autoscale_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/autoscale_test.go
Auto-merging cmd/queue/main.go
CONFLICT (content): Merge conflict in cmd/queue/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Ensure probes from the autoscaler are not passed to the user-container (#13506)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-v1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@nak3: new pull request created: #48

Details

In response to this:

/cherry-pick release-v1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@nak3: #46 failed to apply on top of branch "release-v1.8":

Applying: Ensure probes from the autoscaler are not passed to the user-container (#13506)
Using index info to reconstruct a base tree...
M	cmd/queue/main.go
M	test/e2e/autoscale_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/autoscale_test.go
Auto-merging cmd/queue/main.go
CONFLICT (content): Merge conflict in cmd/queue/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Ensure probes from the autoscaler are not passed to the user-container (#13506)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-v1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants