This repository was archived by the owner on Feb 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 262
cli: add ignition support #3120
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| package configgenerator | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "encoding/base64" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| ignconfig "github.com/coreos/ignition/config/v2_0" | ||
| ignconfigtypes "github.com/coreos/ignition/config/v2_0/types" | ||
| "github.com/coreos/tectonic-installer/installer/pkg/config" | ||
| ) | ||
|
|
||
| var ( | ||
| ignVersion = ignconfigtypes.IgnitionVersion{2, 0, 0, "", ""} | ||
| ignFilesPath = map[string]string{ | ||
| "master": config.IgnitionMaster, | ||
| "worker": config.IgnitionWorker, | ||
| "etcd": config.IgnitionEtcd, | ||
| } | ||
| ) | ||
|
|
||
| const ( | ||
| kubeconfigKubeletPath = "generated/auth/kubeconfig-kubelet" | ||
| ) | ||
|
|
||
| func (c ConfigGenerator) poolToRoleMap() map[string]string { | ||
| poolToRole := make(map[string]string) | ||
| // assume no roles can share pools | ||
| for _, n := range c.Master.NodePools { | ||
| poolToRole[n] = "master" | ||
| } | ||
| for _, n := range c.Worker.NodePools { | ||
| poolToRole[n] = "worker" | ||
| } | ||
| for _, n := range c.Etcd.NodePools { | ||
| poolToRole[n] = "etcd" | ||
| } | ||
| return poolToRole | ||
| } | ||
|
|
||
| // GenerateIgnConfig generates, if successful, files with the ign config for each role. | ||
| func (c ConfigGenerator) GenerateIgnConfig(clusterDir string) error { | ||
| poolToRole := c.poolToRoleMap() | ||
| for _, p := range c.NodePools { | ||
| ignFile := p.IgnitionFile | ||
| ignCfg, err := parseIgnFile(ignFile) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to GenerateIgnConfig for pool %s and file %s: %v", p.Name, p.IgnitionFile, err) | ||
| } | ||
| role := poolToRole[p.Name] | ||
| // TODO(alberto): Append block need to be different for each etcd node. | ||
| // add loop over count if role is etcd | ||
| c.embedAppendBlock(ignCfg, role) | ||
| if role != "etcd" { | ||
| kubeconfigKubeletContent, err := getKubeconfigKubeletContent(clusterDir) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c.embedKubeconfigKubeletBlock(ignCfg, kubeconfigKubeletContent) | ||
| } | ||
|
|
||
| fileTargetPath := filepath.Join(clusterDir, ignFilesPath[role]) | ||
| if err = ignCfgToFile(*ignCfg, fileTargetPath); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func parseIgnFile(filePath string) (*ignconfigtypes.Config, error) { | ||
| if filePath == "" { | ||
| ignition := &ignconfigtypes.Ignition{ | ||
| Version: ignVersion, | ||
| } | ||
| return &ignconfigtypes.Config{Ignition: *ignition}, nil | ||
| } | ||
|
|
||
| data, err := ioutil.ReadFile(filePath) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| cfg, rpt, _ := ignconfig.Parse(data) | ||
| if len(rpt.Entries) > 0 { | ||
| return nil, fmt.Errorf("failed to parse ignition file %s: %s", filePath, rpt.String()) | ||
| } | ||
|
|
||
| return &cfg, nil | ||
| } | ||
|
|
||
| func (c ConfigGenerator) embedAppendBlock(ignCfg *ignconfigtypes.Config, role string) *ignconfigtypes.Config { | ||
| appendBlock := ignconfigtypes.ConfigReference{ | ||
| c.getTNCURL(role), | ||
| ignconfigtypes.Verification{Hash: nil}, | ||
| } | ||
| ignCfg.Ignition.Config.Append = append(ignCfg.Ignition.Config.Append, appendBlock) | ||
| return ignCfg | ||
| } | ||
|
|
||
| func getKubeconfigKubeletContent(clusterDir string) ([]byte, error) { | ||
| kubeconfigKubeletPath := filepath.Join(clusterDir, kubeconfigKubeletPath) | ||
| return ioutil.ReadFile(kubeconfigKubeletPath) | ||
| } | ||
|
|
||
| func (c ConfigGenerator) embedKubeconfigKubeletBlock(ignCfg *ignconfigtypes.Config, kubeconfiKubeletContent []byte) *ignconfigtypes.Config { | ||
| kubeconfigKubelet := ignconfigtypes.File{ | ||
| Path: "/etc/kubernetes/kubeconfig", | ||
| Mode: 420, | ||
| Filesystem: "root", | ||
| Contents: ignconfigtypes.FileContents{ | ||
| Source: ignconfigtypes.Url{ | ||
| Scheme: "data", | ||
| Opaque: fmt.Sprintf("text/plain;charset=utf-8;base64,%s", base64.StdEncoding.EncodeToString(kubeconfiKubeletContent)), | ||
| }, | ||
| }, | ||
| } | ||
| ignCfg.Storage.Files = append(ignCfg.Storage.Files, kubeconfigKubelet) | ||
| return ignCfg | ||
| } | ||
|
|
||
| func (c ConfigGenerator) getTNCURL(role string) ignconfigtypes.Url { | ||
| var url ignconfigtypes.Url | ||
| if role == "master" || role == "worker" { | ||
| url = ignconfigtypes.Url{ | ||
| Scheme: "http", | ||
| Host: fmt.Sprintf("%s-tnc.%s", c.Name, c.BaseDomain), | ||
| Path: fmt.Sprintf("/ign/v1/role/%s", role), | ||
| } | ||
| } | ||
| return url | ||
| } | ||
|
|
||
| func ignCfgToFile(ignCfg ignconfigtypes.Config, filePath string) error { | ||
| data, err := json.MarshalIndent(&ignCfg, "", " ") | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return writeFile(filePath, string(data)) | ||
| } | ||
|
|
||
| func writeFile(path, content string) error { | ||
| f, err := os.Create(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer f.Close() | ||
|
|
||
| w := bufio.NewWriter(f) | ||
| if _, err := fmt.Fprintln(w, content); err != nil { | ||
| return err | ||
| } | ||
| w.Flush() | ||
|
|
||
| return nil | ||
| } | ||
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
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,9 @@ | ||
| { | ||
| "ignition": { "version": "2.0.0" }, | ||
| "systemd": { | ||
| "units": [{ | ||
| "name": "example.service", | ||
| "contents": "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target" | ||
| }] | ||
| } | ||
| } |
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,10 @@ | ||
| { | ||
| "ignition": { "version": "2.0.0" }, | ||
| "systemd": { | ||
| "units": [{ | ||
| "name": "example.service", | ||
| "contents": "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target" | ||
| }] | ||
| } | ||
| "invalid": "" | ||
| } |
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.
This error seems to be completely ignored