-
Notifications
You must be signed in to change notification settings - Fork 17
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
OCPBUGS-1413: Rebase cloud-provider-azure 29.09.2022 #39
OCPBUGS-1413: Rebase cloud-provider-azure 29.09.2022 #39
Conversation
…efile_manifest_windows_image fix: update osversion in Makefile manifest-node-manager-image-window
…batch querying VMSS Flex VMs and their InstanceView interface: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView mock: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView azure_vmclient: ListVmssFlexVMsWithoutInstanceView ListVmssFlexVMsWithOnlyInstanceView unit tests for ListVmssFlexVMsWithOnlyInstanceView & ListVmssFlexVMsWithoutInstanceView fix mock client
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
Vmss flex support: Add two functions in azure_vmclient.go to support batch querying VMSS Flex VMs and their InstanceView
Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest) from 0.11.27 to 0.11.28. - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/main/CHANGELOG.md) - [Commits](Azure/go-autorest@autorest/v0.11.27...autorest/v0.11.28) --- updated-dependencies: - dependency-name: github.com/Azure/go-autorest/autorest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/github.com/Azure/go-autorest/autorest-0.11.28 chore(deps): bump github.com/Azure/go-autorest/autorest from 0.11.27 to 0.11.28
Bumps [github.com/Azure/go-autorest/autorest/adal](https://github.com/Azure/go-autorest) from 0.9.20 to 0.9.21. - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/main/CHANGELOG.md) - [Commits](Azure/go-autorest@autorest/adal/v0.9.20...autorest/adal/v0.9.21) --- updated-dependencies: - dependency-name: github.com/Azure/go-autorest/autorest/adal dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
…-golangci-lint Less mem usage for golangci-lint by less concurrency
…peline Fix aks pipeline to test e2e
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.7 to 10.4.8. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](postcss/autoprefixer@10.4.7...10.4.8) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…peline_gc fix aks pipeline gc job typo and job scheduling typo
…ase-note-v1.1.19 Update release notes for v1.1.19
…ase-note-v1.24.4 Update release notes for v1.24.4
…ot/npm_and_yarn/site/autoprefixer-10.4.8 chore(deps-dev): bump autoprefixer from 10.4.7 to 10.4.8 in /site
…ase-note-v1.0.23 Update release notes for v1.0.23
…ase-note-v1.23.16 Update release notes for v1.23.16
…ot/go_modules/github.com/Azure/go-autorest/autorest/adal-0.9.21 chore(deps): bump github.com/Azure/go-autorest/autorest/adal from 0.9.20 to 0.9.21
Bumps golang from 1.18.4-buster to 1.19.0-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex caches and unit tests VMSS Flex Support: Add vmssflex_cache.go and unit tests vmssflex-cache Unit test for vmssflex_cache unit tests for vmssflex_cache unit test resolve comments remove comments resolve review comments format code fix header remove redundant logs f fix issue merge resolve comments FF
…ot/docker/golang-1.19.0-buster chore(deps): bump golang from 1.18.4-buster to 1.19.0-buster
feat: add PremiumV2LRS disk type support
(cherry picked from commit e99493f)
Delete .github directory entirely since we do not want to use GH workflows, templates, dependabot etc in ocp fork.
…ecific makefile extension, openshift specific hack scripts (cherry picked from commit 5e570ae)
… cloud-controller-manager with latest OCP release
@lobziik: This pull request references Jira Issue OCPBUGS-1413, which is invalid:
Comment 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. |
/jira refresh |
@lobziik: This pull request references Jira Issue OCPBUGS-1413, 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: 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. |
@lobziik: The following tests 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commit history looks correct to me
/approve
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: elmiko 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 |
@lobziik: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-1413 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 kubernetes/test-infra repository. |
This commit rebases the cloud-provider-azure openshift patches on top of the kubernetes-sigs/cloud-provider-azure master branch after 1.25.1 release.
There are several commits that we carry on top of the upstream azure-cloud-provider and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.
(replicated @elmiko's process within openshift/kubernetes-autoscaler)
Process
First we need to identify the carry commits that we currently have, this is done against our previous rebase (or fork in this case) to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).
Identify carry commits:
git log --oneline --no-merges 9cbc9d4aaf6069b641ed9a10dbfc135affedec9d..openshift/master
where
9cbc9d4
is the previous rebase merge commit in our fork. This is thelist of commits we will need to apply onto the new upstream version of the
cloud-provider-azure. ideally, some of these commits can be dropped.
After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:
With the merge-29-09-2022 branch in place, I cherry picked the carry commits which we should carry.
Carried Commits
These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.
Changed Commits
9cb498501
and86dbfe580
was squashed into one796006427 UPSTREAM: <carry>: replace .dockerignore file with the OCP specific one
ART commits and golang update was squashed into one commit
e60228592 UPSTREAM: <carry>: update to golang 1.18, sync cloud-node-manager and cloud-controller-manager with latest OCP release
Changed commits:
70dc69 UPSTREAM: <carry>: delete .github directory
was extended with deletion of newly appeared filesResulting commits after squashes and other changes: