OCPBUGS-23004: Merge https://github.com/kubernetes/cloud-provider-alibaba-cloud:master (8244569) into master #37
Conversation
![cloud-team-rebase-bot[bot]](https://avatars.githubusercontent.com/u/74064623?s=60&v=4){kind=small}
Bugfix/servergroup
Bugfix/no cache for node
feat: filter pods whose ip not in vpc cidr in eni mod
…date Feature/dependency update
feat: update instanceChargeType && instanceSpec
Feature/addon token
support configuring server group batch size
…controller-test test: update route controller tests
openshift-ci-robot
added
jira/valid-reference
|
@cloud-team-rebase-bot[bot]: This pull request references Jira Issue OCPBUGS-23004, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this: 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. |
cloud-team-bot
bot
force-pushed
the
rebase-bot-master
branch
from
fe7a201
to
452bcd8
Compare
cloud-team-bot
bot
force-pushed
the
rebase-bot-master
branch
2 times, most recently
from
d96b7c8
to
6bc6381
Compare
cloud-team-bot
bot
force-pushed
the
rebase-bot-master
branch
from
6bc6381
to
ba976d2
Compare
UPSTREAM: <carry>: Updating ose-alibaba-cloud-controller-manager images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/ose-alibaba-cloud-controller-manager.yml
…ainer image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-alibaba-cloud-controller-manager.yml
…ainer image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e5df10e41b14c724468c8f78e2690f219279bfc4/images/ose-alibaba-cloud-controller-manager.yml
# Conflicts: # vendor/golang.org/x/sys/execabs/execabs_go118.go # vendor/golang.org/x/sys/execabs/execabs_go119.go # vendor/golang.org/x/text/width/tables10.0.0.go # vendor/golang.org/x/text/width/tables11.0.0.go # vendor/golang.org/x/text/width/tables12.0.0.go # vendor/golang.org/x/text/width/tables13.0.0.go # vendor/golang.org/x/text/width/tables9.0.0.go
…ainer image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-alibaba-cloud-controller-manager.yml
cloud-team-bot
bot
force-pushed
the
rebase-bot-master
branch
from
ba976d2
to
a430a61
Compare
|
@cloud-team-rebase-bot: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
|
/approve Overriding the linter since it is only a warning about deprecated code. We aren't shipping Alibaba in 4.16 but we will need to backport this change, so making sure it makes it to master. |
|
@JoelSpeed: Overrode contexts on behalf of JoelSpeed: ci/prow/lint In response to this:
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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoelSpeed The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
openshift-merge-bot
bot
merged commit 97e8335
into
openshift:master
|
@cloud-team-rebase-bot[bot]: Jira Issue OCPBUGS-23004: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-23004 has been moved to the MODIFIED state. In response to this: 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 openshift-eng/jira-lifecycle-plugin repository. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-alibaba-cloud-controller-manager-container-v4.16.0-202401111849.p0.g97e8335.assembly.stream for distgit ose-alibaba-cloud-controller-manager. |
No description provided.