Adopt conditionally based on owner #1214
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ncdc 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 |
k8s-ci-robot
added
the
approved
k8s-ci-robot
added
the
size/L
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
ncdc
force-pushed
the
port-1207-to-master
branch
from
faa0516 to
ffc4a1e
Compare
|
@ncdc looks like there is still some remnants of the go.sum jsonpath issue here |
|
@detiber where do you see that? |
|
gah 1 sec |
Only add a Cluster ownerReference to MachineDeployment if it doesn't already have one. Only add a Cluster ownerReference to MachineSet if it doesn't already have one to a MachineDeployment or Cluster. Only add a Cluster ownerReference to Machine if it doesn't already have one to a MachineSet or Cluster. Signed-off-by: Andy Goldstein <goldsteina@vmware.com>
ncdc
force-pushed
the
port-1207-to-master
branch
from
ffc4a1e to
951a01e
Compare
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
|
/lgtm |
k8s-ci-robot
added
the
lgtm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This ports #1207 to master.
Only add a Cluster ownerReference to MachineDeployment if it doesn't
already have one.
Only add a Cluster ownerReference to MachineSet if it doesn't already
have one to a MachineDeployment or Cluster.
Only add a Cluster ownerReference to Machine if it doesn't already have
one to a MachineSet or Cluster.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #1210
Special notes for your reviewer:
I made a slight change from #1207 - Machines would never belong to a MachineDeployment, so I removed that condition.
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
Release note: