Support user-supplied bootstrap configuration #66
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
eaudetcobello
commented
Oct 8, 2024
Comment on lines
-436
to
+534
| func (r *CK8sConfigReconciler) resolveSecretFileContent(ctx context.Context, ns string, source bootstrapv1.File) ([]byte, error) { | ||
| func (r *CK8sConfigReconciler) resolveSecretFileContent(ctx context.Context, ns string, source bootstrapv1.FileSource) ([]byte, error) { |
There was a problem hiding this comment.
I changed the parameter type from File to FileSource because 1. We do not use any of the fields from the File type, except ContentFrom. 2. This makes the function reusable for any other types that have a FileSource (and therefore reference a secret), but are not an explicit abstraction of a File.
eaudetcobello
commented
Oct 8, 2024
Comment on lines
+593
to
+670
| userSuppliedBootstrapConfig, err := r.resolveUserBootstrapConfig(ctx, scope.Config) | ||
| if err != nil { | ||
| conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error()) | ||
| return ctrl.Result{}, err | ||
| } | ||
|
|
There was a problem hiding this comment.
resolveUserBootstrapConfig returns an empty string if there is no user-supplied configuration, we check this later in common.go.
eaudetcobello
commented
Oct 8, 2024
pkg/cloudinit/common.go
Outdated
Comment on lines
84
to
103
| var configFileContents string | ||
| switch { | ||
| case data.BootstrapConfig != "": | ||
| // User-supplied bootstrap configuration from CK8sConfig object. | ||
| configFileContents = data.BootstrapConfig | ||
| default: | ||
| configFileContents = data.ConfigFileContents | ||
| } |
There was a problem hiding this comment.
user-supplied bootstrap configuration has precedence over our ConfigFileContents
bschimke95
reviewed
Oct 10, 2024
eaudetcobello
force-pushed
the
KU-1612/user-supplied-bootstrap-config
branch
from
851c053
to
102cf8e
Compare
eaudetcobello
force-pushed
the
KU-1612/user-supplied-bootstrap-config
branch
from
e3c9386
to
bffa5e4
Compare
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.
Implements first-party support for supplying a bootstrap configuration (before this, it was done by overriding install.sh and adding a file under extraFiles).
The BootstrapConfig type re-uses the existing FileSource type so that a secret reference can be used to seed the configuration just like we have for files, (e.g. contentFrom).