Bug 2087042: Rebase cloud-provider-azure 22.06.2022 #32
Conversation
Bug: Even "api-version" in decorator is passed to the request, the c.apiVersion (set in New()) will be preferred. Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
Bumps [k8s.io/kubelet](https://github.com/kubernetes/kubelet) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/kubernetes/kubelet/releases) - [Commits](kubernetes/kubelet@v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: k8s.io/kubelet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
add empty value check fix fix year
…ot/go_modules/k8s.io/kubelet-0.24.1 chore(deps): bump k8s.io/kubelet from 0.24.0 to 0.24.1
feat: add blobclient for blob container operations
Bumps [k8s.io/controller-manager](https://github.com/kubernetes/controller-manager) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/kubernetes/controller-manager/releases) - [Commits](kubernetes/controller-manager@v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: k8s.io/controller-manager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* Support VMSS for test: should add all nodes in different agent pools to backends * Support scaling MachinePool for VMSS scaling tests Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
Then CCM Pods should be distributed to control plane Nodes evenly. Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
…-topology CCM deployment uses topologySpreadConstraints
…mplate Provide single and multiple vmss templates
…ot/go_modules/k8s.io/controller-manager-0.24.1 chore(deps): bump k8s.io/controller-manager from 0.24.0 to 0.24.1
Bumps [k8s.io/component-helpers](https://github.com/kubernetes/component-helpers) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/kubernetes/component-helpers/releases) - [Commits](kubernetes/component-helpers@v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: k8s.io/component-helpers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/k8s.io/component-helpers-0.24.1 chore(deps): bump k8s.io/component-helpers from 0.24.0 to 0.24.1
Bumps [k8s.io/cloud-provider](https://github.com/kubernetes/cloud-provider) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/kubernetes/cloud-provider/releases) - [Commits](kubernetes/cloud-provider@v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: k8s.io/cloud-provider dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/k8s.io/cloud-provider-0.24.1 chore(deps): bump k8s.io/cloud-provider from 0.24.0 to 0.24.1
[e2e] Adjust for VMSS CAPZ clusters
Bumps golang from 1.18.2-buster to 1.18.3-buster. --- updated-dependencies: - dependency-name: golang 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>
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.1 to 1.7.2. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.7.1...v1.7.2) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Add jwtty to owners list
…-templates Support ci-version templates for CAPZ jobs
…ot/go_modules/github.com/stretchr/testify-1.7.2 chore(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.2
…-panic fix: panic when create private endpoint using azurefile NFS
…ot/docker/golang-1.18.3-buster chore(deps): bump golang from 1.18.2-buster to 1.18.3-buster
openshift-ci
bot
added
bugzilla/severity-high
|
@lobziik: This pull request references Bugzilla bug 2087042, which is valid. The bug has been updated to refer to the pull request using the external bug tracker. 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. |
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
lobziik
force-pushed
the
merge-22-06-2022
branch
from
e56be73
to
d762b53
Compare
|
@lobziik: This pull request references Bugzilla bug 2087042, which is valid. 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. |
… cloud-controller-manager with latest OCP release
The Makefile sets GOARCH?=amd64, which needs to be overridden for this image to build properly on other architectures. (cherry picked from commit 86e0d4c)
lobziik
force-pushed
the
merge-22-06-2022
branch
from
d762b53
to
cd9ccb2
Compare
|
@lobziik: This pull request references Bugzilla bug 2087042, which is valid. 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. |
|
/retest |
|
@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. |
|
/approve |
|
[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
|
@lobziik: Some pull requests linked via external trackers have merged: The following pull requests linked via external trackers have not merged:
These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with Bugzilla bug 2087042 has not 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.24.2 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 303f6ddce98eb78d9858ae17abee46f67a08135f..openshift/masterwhere
303f6dis the last upstream 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-22-06-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.
Note: github dir removal commit was reordered with
Changed Commits
All commits related to OWNERS file was squashed into
e99493 UPSTREAM: <carry>: Update OWNERS file8a35d2 UPSTREAM: <carry>: Fix "verify" job cloud-team-rebase-botwas squashed intoe72384 UPSTREAM: <carry>: add dockerfiles for openshift builds, openshift specific makefile extension, openshift specific hack scripts70dc69 UPSTREAM: <carry>: delete .github directorywas extended with deletion of newly appeared filesART commits and golang update was squashed into one commit
53c43dbDropped Commits