-
Notifications
You must be signed in to change notification settings - Fork 8
✨ feat: add ignition bootstrap data support #270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tuunit
wants to merge
10
commits into
main
Choose a base branch
from
flatcar-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b0dc900
add format (cloud-config/ignition) extraction
tuunit 18d614b
fix github codespell and linting issues
tuunit 24e57b5
add ignition enrichment
tuunit 9913dfb
fix escaping of data urls
tuunit 8edc053
add flatcar cluster template
tuunit 8049710
fix linting issue
tuunit 420ad30
fix license header
tuunit baf26f8
go mod tidy
tuunit 79b3eef
fix templating for provider-id
tuunit 15de9c6
apply review suggestions
tuunit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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,33 @@ | ||
| /* | ||
| Copyright 2024 IONOS Cloud. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package cloud | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "fmt" | ||
| ) | ||
|
|
||
| func enrichCloudInitConfig(machineName string, userData string) string { | ||
| const bootCmdFormat = `bootcmd: | ||
| - echo %[1]s > /etc/hostname | ||
| - hostname %[1]s | ||
| ` | ||
| bootCmdString := fmt.Sprintf(bootCmdFormat, machineName) | ||
| enrichedData := fmt.Sprintf("%s\n%s", userData, bootCmdString) | ||
|
|
||
| return base64.StdEncoding.EncodeToString([]byte(enrichedData)) | ||
| } |
This file contains hidden or 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,102 @@ | ||
| /* | ||
| Copyright 2024 IONOS Cloud. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package cloud | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/url" | ||
|
|
||
| ignition "github.com/flatcar/ignition/config/v2_3" | ||
| igntypes "github.com/flatcar/ignition/config/v2_3/types" | ||
| "k8s.io/utils/ptr" | ||
|
|
||
| infrav1 "github.com/ionos-cloud/cluster-api-provider-ionoscloud/api/v1alpha1" | ||
| ) | ||
|
|
||
| func enrichIgnitionConfig(machine *infrav1.IonosCloudMachine, bootstrapData []byte) ([]byte, error) { | ||
| ign, err := convertToIgnition(bootstrapData) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("converting bootstrap-data to Ignition: %w", err) | ||
| } | ||
|
|
||
| baseConfig := getIgnitionBaseConfig(machine) | ||
| ign = ignition.Append(ign, baseConfig) | ||
|
|
||
| userData, err := json.Marshal(&ign) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("marshaling generated Ignition config into JSON: %w", err) | ||
| } | ||
|
|
||
| return userData, nil | ||
| } | ||
|
|
||
| func convertToIgnition(data []byte) (igntypes.Config, error) { | ||
| cfg, reports, err := ignition.Parse(data) | ||
| if err != nil { | ||
| return igntypes.Config{}, fmt.Errorf("parsing Ignition config: %w", err) | ||
| } | ||
| if reports.IsFatal() { | ||
| return igntypes.Config{}, fmt.Errorf("error parsing Ignition config: %v", reports.String()) | ||
| } | ||
|
|
||
| return cfg, nil | ||
| } | ||
|
|
||
| func getIgnitionBaseConfig(machine *infrav1.IonosCloudMachine) igntypes.Config { | ||
| metadata := fmt.Sprintf("COREOS_CUSTOM_HOSTNAME=%s\n", machine.Name) | ||
| return igntypes.Config{ | ||
| Storage: igntypes.Storage{ | ||
| Files: []igntypes.File{ | ||
| { | ||
| Node: igntypes.Node{ | ||
| Filesystem: "root", | ||
| Path: "/etc/hostname", | ||
| Overwrite: ptr.To(true), | ||
| }, | ||
| FileEmbedded1: igntypes.FileEmbedded1{ | ||
| Mode: ptr.To(0o644), | ||
| Contents: igntypes.FileContents{ | ||
| Source: "data:," + machine.Name, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Node: igntypes.Node{ | ||
| Filesystem: "root", | ||
| Path: "/etc/ionoscloud-env", | ||
| Overwrite: ptr.To(true), | ||
| }, | ||
| FileEmbedded1: igntypes.FileEmbedded1{ | ||
| Mode: ptr.To(420), | ||
| Contents: igntypes.FileContents{ | ||
| Source: "data:," + url.PathEscape(metadata), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Systemd: igntypes.Systemd{ | ||
| Units: []igntypes.Unit{ | ||
| { | ||
| Name: "systemd-resolved.service", | ||
| Enable: true, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } |
This file contains hidden or 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
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.
We can improve user visibility here.
by setting a condition and throwing a warning event.
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.
What exactly do you mean by setting a condition?
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.
something like: