Rudoi/honor machinedeployments in machine phase #3
+315
−12
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
h0tbird
reviewed
Apr 5, 2019
There was a problem hiding this comment.
Be aware that CAPA requires a change too to be compatible with this code.
https://github.com/newrelic-forks/cluster-api-provider-aws/blob/6f304f5e2d2c51e16d608797bba790e0306b4787/pkg/cloud/aws/services/kubeadm/aws_defaults.go#L169
➜ cluster-api-provider-aws git:(test-andrew-pr) ✗ git diff
diff --git a/pkg/cloud/aws/services/kubeadm/aws_defaults.go b/pkg/cloud/aws/services/kubeadm/aws_defaults.go
index 9721c874..34da098d 100644
--- a/pkg/cloud/aws/services/kubeadm/aws_defaults.go
+++ b/pkg/cloud/aws/services/kubeadm/aws_defaults.go
@@ -166,7 +166,7 @@ func SetJoinNodeConfigurationOverrides(caCertHash, bootstrapToken string, machin
klog.Infof("Overriding node's cloud-provider to the required value of %q.", cloudProvider)
}
base.NodeRegistration.KubeletExtraArgs["cloud-provider"] = cloudProvider
- if !util.IsControlPlaneMachine(machine.Machine) {
+ if !util.IsControlPlaneMachine(machine.Machine.Spec) {
base.NodeRegistration.KubeletExtraArgs["node-labels"] = nodeRole
}
}
|
@h0tbird I created a new function specific to MachineDeployments as to not break that function. |
rudoi
force-pushed
the
rudoi/honor-machinedeployments-in-machine-phase
branch
from
f789e12 to
e1c077c
Compare
h0tbird
suggested changes
Apr 8, 2019
added 5 commits
April 15, 2019 13:55
rudoi
force-pushed
the
rudoi/honor-machinedeployments-in-machine-phase
branch
from
3a85cc0 to
6a27382
Compare
w21froster
pushed a commit
that referenced
this pull request
Sep 19, 2024
* Introduce CEL for ClusterClass Variables Signed-off-by: chaunceyjiang <[email protected]> * feat: Implement CEL validation * refactor: Add comments from previous code reviews * chore: Generate CC manifest after fixing list type annotation (#2) * chore: Fix up CRD manifest * fix: Pass through context to CEL funcs * feat: Add CEL admission cost validation * refactor: Add nolint to unbounded * refactor: Fix up new func signature * build: Fix up go mod for tools * fixup! refactor: Apply review feedback * fixup! build: Regenerate openapi spec * fixup! refactor: Apply review feedback * fixup! fix: Regenerate everything * fixup! fix: Apply review feedback * fixup! fix: More review feedback * fixup! refactor: Address review feedback, especially re recursion * fixup! fix: Check total cost * fixup! refactor: Address review feedback - rename testCtx to ctx * CEL: Various improvements (#3) * resolve compile issue after rebase * Some more improvements (#4) --------- Signed-off-by: chaunceyjiang <[email protected]> Co-authored-by: Jimmi Dyson <[email protected]> Co-authored-by: Jimmi Dyson <[email protected]> Co-authored-by: Stefan Büringer <[email protected]> Co-authored-by: Stefan Bueringer <[email protected]>
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:
The
apply-machinesphase will now detect and apply MachineDeployments as nodes, and therefore, so willclusterctl create cluster.Release note: