Skip to content
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

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022 #20

Merged
merged 56 commits into from
Jun 17, 2022
Merged

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022 #20

merged 56 commits into from
Jun 17, 2022

Conversation

lobziik
Copy link

@lobziik lobziik commented Jun 15, 2022

This PR rebases the cloud-provider-vsphere openshift patches on top of the kubernetes/cloud-provider-vsphere master branch after bump dependencies to kube v1.24.1 release.

There are several commits that we carry on top of the upstream cloud-provider-vsphere and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(replicated old @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 556ede7f720b9cc91c22b23b360b6156a1824b29..openshift/master

where 556ede is the last upstream commit in our fork. This is the
list of commits we will need to apply onto the new upstream version of the
cloud-provider-vsphere. 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:

$ git remote update # make sure we update our refs
$ git checkout 619502ff4276c345966584bb1f412157385ba7c0 # last commit in upstream master
$ git checkout -b merge-tmp # create a temporary branch for our merge commit
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge kubernetes/cloud-provider-vsphere 15-06-2022 ' | git commit-tree rebase-tmp^{tree} -p HEAD -p merge-tmp -F - # create a new merge commit for our history
fdce34cafdcb91f3dad263eb624ca02150c21b5f # id of new merge commit
$ git branch merge-15-06-2022 fdce34cafdcb91f3dad263eb624ca02150c21b5f # create a new branch for the cherry-pick work
$ git checkout merge-15-06-2022
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-15-06-2022 branch in place, I cherry picked the carry commits which we should carry.

Commits to carry:

These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.

afd0d591 UPSTREAM: <carry>: Run unit tests from pkg folder only
0400604f UPSTREAM: <carry>: Use golang 1.17 to build the component image
bb9b2a3f UPSTREAM: <carry>: Updating and vendoring go modules after an upstream rebase
b3d92d73 UPSTREAM: <carry>: disable staticcheck for OpenShift CI
e965bd94 UPSTREAM: <carry>: Add .ci-operator.yaml file
f4a86607 UPSTREAM: <carry>: fix staticcheck cache in openshift ci
8898a862 UPSTREAM: <carry>: Add vendored dependencies (vendor)
34e82d18 UPSTREAM: <carry>: Remove /vendor folder from .gitignore
d3a5bdc9 UPSTREAM: <carry>: OCP specific build scripts and Dockerfile
eba378c1 UPSTREAM: <carry>: rm OWNERS_ALIASES and upd OWNERS

Changes in commits:

b3d92d73 UPSTREAM: <carry>: disable staticcheck for OpenShift CI
f4a86607 UPSTREAM: <carry>: fix staticcheck cache in openshift ci
d3a5bdc9 UPSTREAM: <carry>: OCP specific build scripts and Dockerfile

Commits above was squashed into a single commit: 1fc9db07 UPSTREAM: <carry>: OCP specific build scripts and Dockerfile

Commit with dependencies vendoring was added on top of all.

HanFa and others added 30 commits January 13, 2022 12:50
Fix staticcheck error by cluster-api dependency.
Remove extra key name in chart release config
In case if multiple VMs with the same hostname exists
within the same scope, picking wrong VM is quite possible,
which might lead to hard-diagnosable issues with
Nodes initialization, or even to incorrect Node initialization.

This commit replaces `FindByDnsName` call to `FindAllByDnsName`,
`GetVMByDNSName` function now returns an error in case if
multiple VMs with the same HostName was found.
…-hostnames

Return an error if multiple VMs with the same hostname was found
IP address typo in secrets examples
Wrong vCenter IP in kubernetes-on-vsphere-with-kubeadm.md secrets example
Signed-off-by: Xudong Liu <xudongliuharold@gmail.com>
…dd-pod-priority-class-name

Patch priorityClassName: system-node-critical in CPI daemonset
Signed-off-by: Xudong Liu <xudongl@vmware.com>
…eprecate-pod-priority-class

Deprecate pod priority annotation in cpi deployment
Signed-off-by: Chen Lin <linch@vmware.com>
…st-coverage

Add script for test coverage pipeline
Signed-off-by: Chen Lin <linch@vmware.com>
…st-coverage

Refactor unit-test and  test-cover in MAKEFILE
This patch updates the cluster and node selector for the paravirtual
mode for the CPI.

Signed-off-by: Sagar Muchhal <muchhals@vmware.com>
Return error when VM's info returned from VC doesn't contains IP address
In the `Zones and Regions for Pod and Volume Placement - CPI` section, there was a link to a "zones/regions tutorial" that sent the user to a nonexistent Markdown file (https://github.com/kubernetes/cloud-provider-vsphere/blob/master/docs/book/tutorials/deploying_cpi_and_csi_with_multi_dc_vc_aka_zones.md). I have replaced that broken link with a link to the most similar tutorial I could find in the docs: [Deploying the vSphere CPI and CSI in a Multi-vCenter OR Multi-Datacenter Environment using Zones](https://cloud-provider-vsphere.sigs.k8s.io/tutorials/deploying_cpi_with_multi_dc_vc_aka_zones.html).
Signed-off-by: Xudong Liu <xudongl@vmware.com>
…maintainer

Add xudong liu as cloud provider vsphere maintainer
@lobziik lobziik changed the title Rebase cloud-provider-vsphere 15.06.2022 Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022 Jun 15, 2022
@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jun 15, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 15, 2022

@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
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022

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.

Denis Moiseev and others added 7 commits June 15, 2022 17:43
@openshift-ci
Copy link

openshift-ci bot commented Jun 15, 2022

@lobziik: This pull request references Bugzilla bug 2087042, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022

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.

1 similar comment
@openshift-ci
Copy link

openshift-ci bot commented Jun 15, 2022

@lobziik: This pull request references Bugzilla bug 2087042, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

In response to this:

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022

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.

@elmiko
Copy link

elmiko commented Jun 15, 2022

@lobziik following on from our discussion today, i think it would be nice to note in the description the commit you are adding and what it's fixing.

@JoelSpeed
Copy link

/retest

@lobziik
Copy link
Author

lobziik commented Jun 16, 2022

@elmiko - this required more work around than i expected, i will create a follow up pr with envtest update. Lets leave just rebase and revendoring here.

@elmiko
Copy link

elmiko commented Jun 16, 2022

ack, thanks for the update @lobziik

Copy link

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

this generally looks correct to me
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2022
@lobziik
Copy link
Author

lobziik commented Jun 17, 2022

/retest

@JoelSpeed
Copy link

/approve

@openshift-ci
Copy link

openshift-ci bot commented Jun 17, 2022

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2022
@openshift-ci openshift-ci bot merged commit bd8d6c1 into openshift:master Jun 17, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 17, 2022

@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 refresh.

Bugzilla bug 2087042 has not been moved to the MODIFIED state.

In response to this:

Bug 2087042: Rebase cloud-provider-vsphere 15.06.2022

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-ci
Copy link

openshift-ci bot commented Jun 17, 2022

@lobziik: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/verify-git-history c7ac93a link false /test verify-git-history

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.

@lobziik lobziik deleted the merge-15-06-2022 branch October 13, 2022 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.