Rebase to latest upstream release #248
Conversation
…om-binaries Inject Windows custom binaries for use in PRs and running against Kubernetes CI
…clusters-custom-vnet-delete fix managed clusters custom VNet delete issue
Tilt requirements section added to docs
Update Calico to v3.20.0
Update dev kubectl to v1.21.4
…tions-main Ensure Github Actions run on main branch after rename
Update docs to reference main branch
…ters Remove dangling references to old branch
…for private clusters)
…ckstart docs: clarify deploying workload clusters with tilt
…tion-release Automate release via Github Action
…mplate docs: mention Troubleshooting in the issue template
…n-message Fix immutable error message for AzureEnvironment
Print VNET range when subnet CIDR range is invalid
…elease-notes Handle pre-releases in release-notes make target
…d-ssh-defaults Re-add defaulting for AzureMachineTemplate ssh key
Cherry pick of kubernetes-sigs#1830: chore: add mixed protocol feature gates
…ot/cherry-pick-1810-to-release-1.0 [release-1.0] v1alpha4 -> v1beta1 clusterctl upgrade test
…ot/cherry-pick-1882-to-release-1.0 [release-1.0] Fix AAD pod identity integration for sovereign clouds
|
/retest |
|
@alexander-demichev: 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. |
OWNERS
Outdated
| - JoelSpeed | ||
| - elmiko | ||
| - Fedosin | ||
| - lobziik |
There was a problem hiding this comment.
Probably not worth adding Denis here as he will be leaving the team shortly
openshift/Dockerfile.openshift
Outdated
| @@ -0,0 +1,18 @@ | |||
| FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder | |||
|
/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 |
|
/retest |
This commit rebases the cluster-api-provider-azure openshift patches on top of the kubernetes-sigs/ cluster-api-provider-azure main branch after.
There are several commits that we carry on top of the upstream cluster-api-provider-azure 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:
where b4be01 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
cluster-api. 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 rebase-upstream-latest 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
Dropped Commits
Click to expand