feat: CSE-based bootstrapping with bootstrapping client mode #527
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Define the file path | ||
| FILE="pkg/provisionclients/client/operations/node_bootstrapping_get_responses.go" | ||
|
|
||
| # Check if the file exists | ||
| if [ ! -f "$FILE" ]; then | ||
| echo "File $FILE does not exist." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Use sed to delete the readResponse() method if it exists | ||
| sed -i '/func (o \*NodeBootstrappingGetDefault) readResponse/,/^}/d' "$FILE" | ||
|
|
||
| echo "readResponse() method deleted from $FILE if it existed. This is for a temporary fix that is in node_bootstrapping_get_responses_override.go." |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ tools() { | |
| go install github.com/rhysd/actionlint/cmd/[email protected] | ||
| go install github.com/mattn/[email protected] | ||
| go install github.com/google/go-containerregistry/cmd/[email protected] | ||
| go install github.com/go-swagger/go-swagger/cmd/[email protected] | ||
|
|
||
| if ! echo "$PATH" | grep -q "${GOPATH:-undefined}/bin\|$HOME/go/bin"; then | ||
| echo "Go workspace's \"bin\" directory is not in PATH. Run 'export PATH=\"\$PATH:\${GOPATH:-\$HOME/go}/bin\"'." | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,10 +103,12 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont | |
| options.FromContext(ctx).ClusterEndpoint, | ||
| azConfig.TenantID, | ||
| azConfig.SubscriptionID, | ||
| azConfig.ResourceGroup, | ||
| azConfig.KubeletIdentityClientID, | ||
| azConfig.NodeResourceGroup, | ||
| azConfig.Location, | ||
| vnetGUID, | ||
| options.FromContext(ctx).ProvisionMode, | ||
|
There was a problem hiding this comment. Do we need provision mode or would it be better to align on a NAP flag? There was a problem hiding this comment. There could be more than one provisioning mode (including within NAP) There was a problem hiding this comment. #527 (comment) yeah I responded down here with similar arguement. We could have multiple provisioning modes, also we could have mulitple "types" of karpenter self-hosted aks, managed aks, self-hosted azure, its arguable that even this boolean flag I am introducing in my PR would make more sense as a string with multiple options. |
||
| ) | ||
| instanceTypeProvider := instancetype.NewProvider( | ||
| azConfig.Location, | ||
|
|
@@ -129,6 +131,7 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont | |
| azConfig.Location, | ||
| azConfig.NodeResourceGroup, | ||
| azConfig.SubscriptionID, | ||
| options.FromContext(ctx).ProvisionMode, | ||
| ) | ||
|
|
||
| return ctx, &Operator{ | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ func (o Options) Validate() error { | |
| o.validateNetworkingOptions(), | ||
| o.validateVMMemoryOverheadPercent(), | ||
| o.validateVnetSubnetID(), | ||
| o.validateProvisionMode(), | ||
| validate.Struct(o), | ||
| ) | ||
| } | ||
|
|
@@ -83,6 +84,18 @@ func (o Options) validateVMMemoryOverheadPercent() error { | |
| return nil | ||
| } | ||
|
|
||
| func (o Options) validateProvisionMode() error { | ||
| if o.ProvisionMode != consts.ProvisionModeAKSSelfContained && o.ProvisionMode != consts.ProvisionModeBootstrappingClient { | ||
| return fmt.Errorf("provision-mode is invalid: %s", o.ProvisionMode) | ||
| } | ||
| if o.ProvisionMode == consts.ProvisionModeBootstrappingClient { | ||
| if o.NodeBootstrappingServerURL == "" { | ||
| return fmt.Errorf("nodebootstrapping-server-url is required when provision-mode is bootstrappingclient") | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (o Options) validateRequiredFields() error { | ||
| if o.ClusterEndpoint == "" { | ||
| return fmt.Errorf("missing field, cluster-endpoint") | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of thoughts:
//go:generate swagger generate client ...etc.--keep-spec-order?