-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #261 from bgilbert/stabilization
Stabilize `fcos` 1.4.0 and `openshift` 4.9.0
- Loading branch information
Showing
33 changed files
with
3,486 additions
and
40 deletions.
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
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,40 @@ | ||
| // Copyright 2020 Red Hat, Inc | ||
| // | ||
| // 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 v1_5_exp | ||
|
|
||
| import ( | ||
| base "github.com/coreos/butane/base/v0_5_exp" | ||
| ) | ||
|
|
||
| type Config struct { | ||
| base.Config `yaml:",inline"` | ||
| BootDevice BootDevice `yaml:"boot_device"` | ||
| } | ||
|
|
||
| type BootDevice struct { | ||
| Layout *string `yaml:"layout"` | ||
| Luks BootDeviceLuks `yaml:"luks"` | ||
| Mirror BootDeviceMirror `yaml:"mirror"` | ||
| } | ||
|
|
||
| type BootDeviceLuks struct { | ||
| Tang []base.Tang `yaml:"tang"` | ||
| Threshold *int `yaml:"threshold"` | ||
| Tpm2 *bool `yaml:"tpm2"` | ||
| } | ||
|
|
||
| type BootDeviceMirror struct { | ||
| Devices []string `yaml:"devices"` | ||
| } |
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,272 @@ | ||
| // Copyright 2020 Red Hat, Inc | ||
| // | ||
| // 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 v1_5_exp | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| baseutil "github.com/coreos/butane/base/util" | ||
| "github.com/coreos/butane/config/common" | ||
| cutil "github.com/coreos/butane/config/util" | ||
| "github.com/coreos/butane/translate" | ||
|
|
||
| "github.com/coreos/ignition/v2/config/util" | ||
| "github.com/coreos/ignition/v2/config/v3_4_experimental/types" | ||
| "github.com/coreos/vcontext/path" | ||
| "github.com/coreos/vcontext/report" | ||
| ) | ||
|
|
||
| const ( | ||
| biosTypeGuid = "21686148-6449-6E6F-744E-656564454649" | ||
| prepTypeGuid = "9E1A2D38-C612-4316-AA26-8B49521E5A8B" | ||
| espTypeGuid = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" | ||
|
|
||
| // The partition layout implemented in this file replicates | ||
| // the layout of the OS image defined in: | ||
| // https://github.com/coreos/coreos-assembler/blob/main/src/create_disk.sh | ||
| // | ||
| // Exception: we don't try to skip unused partition numbers, | ||
| // because specifying a partition number would prevent child | ||
| // configs from overriding partition fields using the partition | ||
| // label as the lookup key. | ||
| // | ||
| // It's not critical that we match that layout exactly; the hard | ||
| // constraints are: | ||
| // - The desugared partition cannot be smaller than the one it | ||
| // replicates | ||
| // - The new BIOS-BOOT partition (and maybe the PReP one?) must be | ||
| // at the same offset as the original | ||
| // | ||
| // Do not change these constants! New partition layouts must be | ||
| // encoded into new layout templates. | ||
| biosV1SizeMiB = 1 | ||
| prepV1SizeMiB = 4 | ||
| espV1SizeMiB = 127 | ||
| bootV1SizeMiB = 384 | ||
| ) | ||
|
|
||
| // ToIgn3_4Unvalidated translates the config to an Ignition config. It also | ||
| // returns the set of translations it did so paths in the resultant config | ||
| // can be tracked back to their source in the source config. No config | ||
| // validation is performed on input or output. | ||
| func (c Config) ToIgn3_4Unvalidated(options common.TranslateOptions) (types.Config, translate.TranslationSet, report.Report) { | ||
| ret, ts, r := c.Config.ToIgn3_4Unvalidated(options) | ||
| if r.IsFatal() { | ||
| return types.Config{}, translate.TranslationSet{}, r | ||
| } | ||
| r.Merge(c.processBootDevice(&ret, &ts, options)) | ||
| return ret, ts, r | ||
| } | ||
|
|
||
| // ToIgn3_4 translates the config to an Ignition config. It returns a | ||
| // report of any errors or warnings in the source and resultant config. If | ||
| // the report has fatal errors or it encounters other problems translating, | ||
| // an error is returned. | ||
| func (c Config) ToIgn3_4(options common.TranslateOptions) (types.Config, report.Report, error) { | ||
| cfg, r, err := cutil.Translate(c, "ToIgn3_4Unvalidated", options) | ||
| return cfg.(types.Config), r, err | ||
| } | ||
|
|
||
| // ToIgn3_4Bytes translates from a v1.5 Butane config to a v3.4.0 Ignition config. It returns a report of any errors or | ||
| // warnings in the source and resultant config. If the report has fatal errors or it encounters other problems | ||
| // translating, an error is returned. | ||
| func ToIgn3_4Bytes(input []byte, options common.TranslateBytesOptions) ([]byte, report.Report, error) { | ||
| return cutil.TranslateBytes(input, &Config{}, "ToIgn3_4", options) | ||
| } | ||
|
|
||
| func (c Config) processBootDevice(config *types.Config, ts *translate.TranslationSet, options common.TranslateOptions) report.Report { | ||
| var rendered types.Config | ||
| renderedTranslations := translate.NewTranslationSet("yaml", "json") | ||
| var r report.Report | ||
|
|
||
| // check for high-level features | ||
| wantLuks := util.IsTrue(c.BootDevice.Luks.Tpm2) || len(c.BootDevice.Luks.Tang) > 0 | ||
| wantMirror := len(c.BootDevice.Mirror.Devices) > 0 | ||
| if !wantLuks && !wantMirror { | ||
| return r | ||
| } | ||
|
|
||
| // compute layout rendering options | ||
| var wantBIOSPart bool | ||
| var wantEFIPart bool | ||
| var wantPRePPart bool | ||
| layout := c.BootDevice.Layout | ||
| switch { | ||
| case layout == nil || *layout == "x86_64": | ||
| wantBIOSPart = true | ||
| wantEFIPart = true | ||
| case *layout == "aarch64": | ||
| wantEFIPart = true | ||
| case *layout == "ppc64le": | ||
| wantPRePPart = true | ||
| default: | ||
| // should have failed validation | ||
| panic("unknown layout") | ||
| } | ||
|
|
||
| // mirrored root disk | ||
| if wantMirror { | ||
| // partition disks | ||
| for i, device := range c.BootDevice.Mirror.Devices { | ||
| labelIndex := len(rendered.Storage.Disks) + 1 | ||
| disk := types.Disk{ | ||
| Device: device, | ||
| WipeTable: util.BoolToPtr(true), | ||
| } | ||
| if wantBIOSPart { | ||
| disk.Partitions = append(disk.Partitions, types.Partition{ | ||
| Label: util.StrToPtr(fmt.Sprintf("bios-%d", labelIndex)), | ||
| SizeMiB: util.IntToPtr(biosV1SizeMiB), | ||
| TypeGUID: util.StrToPtr(biosTypeGuid), | ||
| }) | ||
| } | ||
| if wantPRePPart { | ||
| disk.Partitions = append(disk.Partitions, types.Partition{ | ||
| Label: util.StrToPtr(fmt.Sprintf("prep-%d", labelIndex)), | ||
| SizeMiB: util.IntToPtr(prepV1SizeMiB), | ||
| TypeGUID: util.StrToPtr(prepTypeGuid), | ||
| }) | ||
| } | ||
| if wantEFIPart { | ||
| disk.Partitions = append(disk.Partitions, types.Partition{ | ||
| Label: util.StrToPtr(fmt.Sprintf("esp-%d", labelIndex)), | ||
| SizeMiB: util.IntToPtr(espV1SizeMiB), | ||
| TypeGUID: util.StrToPtr(espTypeGuid), | ||
| }) | ||
| } | ||
| disk.Partitions = append(disk.Partitions, types.Partition{ | ||
| Label: util.StrToPtr(fmt.Sprintf("boot-%d", labelIndex)), | ||
| SizeMiB: util.IntToPtr(bootV1SizeMiB), | ||
| }, types.Partition{ | ||
| Label: util.StrToPtr(fmt.Sprintf("root-%d", labelIndex)), | ||
| }) | ||
| renderedTranslations.AddFromCommonSource(path.New("yaml", "boot_device", "mirror", "devices", i), path.New("json", "storage", "disks", len(rendered.Storage.Disks)), disk) | ||
| rendered.Storage.Disks = append(rendered.Storage.Disks, disk) | ||
|
|
||
| if wantEFIPart { | ||
| // add ESP filesystem | ||
| espFilesystem := types.Filesystem{ | ||
| Device: fmt.Sprintf("/dev/disk/by-partlabel/esp-%d", labelIndex), | ||
| Format: util.StrToPtr("vfat"), | ||
| Label: util.StrToPtr(fmt.Sprintf("esp-%d", labelIndex)), | ||
| WipeFilesystem: util.BoolToPtr(true), | ||
| } | ||
| renderedTranslations.AddFromCommonSource(path.New("yaml", "boot_device", "mirror", "devices", i), path.New("json", "storage", "filesystems", len(rendered.Storage.Filesystems)), espFilesystem) | ||
| rendered.Storage.Filesystems = append(rendered.Storage.Filesystems, espFilesystem) | ||
| } | ||
| } | ||
| renderedTranslations.AddTranslation(path.New("yaml", "boot_device", "mirror", "devices"), path.New("json", "storage", "disks")) | ||
|
|
||
| // create RAIDs | ||
| raidDevices := func(labelPrefix string) []types.Device { | ||
| count := len(rendered.Storage.Disks) | ||
| ret := make([]types.Device, count) | ||
| for i := 0; i < count; i++ { | ||
| ret[i] = types.Device(fmt.Sprintf("/dev/disk/by-partlabel/%s-%d", labelPrefix, i+1)) | ||
| } | ||
| return ret | ||
| } | ||
| rendered.Storage.Raid = []types.Raid{{ | ||
| Devices: raidDevices("boot"), | ||
| Level: util.StrToPtr("raid1"), | ||
| Name: "md-boot", | ||
| // put the RAID superblock at the end of the | ||
| // partition so BIOS GRUB doesn't need to | ||
| // understand RAID | ||
| Options: []types.RaidOption{"--metadata=1.0"}, | ||
| }, { | ||
| Devices: raidDevices("root"), | ||
| Level: util.StrToPtr("raid1"), | ||
| Name: "md-root", | ||
| }} | ||
| renderedTranslations.AddFromCommonSource(path.New("yaml", "boot_device", "mirror"), path.New("json", "storage", "raid"), rendered.Storage.Raid) | ||
|
|
||
| // create boot filesystem | ||
| bootFilesystem := types.Filesystem{ | ||
| Device: "/dev/md/md-boot", | ||
| Format: util.StrToPtr("ext4"), | ||
| Label: util.StrToPtr("boot"), | ||
| WipeFilesystem: util.BoolToPtr(true), | ||
| } | ||
| renderedTranslations.AddFromCommonSource(path.New("yaml", "boot_device", "mirror"), path.New("json", "storage", "filesystems", len(rendered.Storage.Filesystems)), bootFilesystem) | ||
| rendered.Storage.Filesystems = append(rendered.Storage.Filesystems, bootFilesystem) | ||
| } | ||
|
|
||
| // encrypted root partition | ||
| if wantLuks { | ||
| luksDevice := "/dev/disk/by-partlabel/root" | ||
| if wantMirror { | ||
| luksDevice = "/dev/md/md-root" | ||
| } | ||
| clevis, ts2, r2 := translateBootDeviceLuks(c.BootDevice.Luks, options) | ||
| rendered.Storage.Luks = []types.Luks{{ | ||
| Clevis: clevis, | ||
| Device: &luksDevice, | ||
| Label: util.StrToPtr("luks-root"), | ||
| Name: "root", | ||
| WipeVolume: util.BoolToPtr(true), | ||
| }} | ||
| lpath := path.New("yaml", "boot_device", "luks") | ||
| rpath := path.New("json", "storage", "luks", 0) | ||
| renderedTranslations.Merge(ts2.PrefixPaths(lpath, rpath.Append("clevis"))) | ||
| for _, f := range []string{"device", "label", "name", "wipeVolume"} { | ||
| renderedTranslations.AddTranslation(lpath, rpath.Append(f)) | ||
| } | ||
| renderedTranslations.AddTranslation(lpath, rpath) | ||
| renderedTranslations.AddTranslation(lpath, path.New("json", "storage", "luks")) | ||
| r.Merge(r2) | ||
| } | ||
|
|
||
| // create root filesystem | ||
| var rootDevice string | ||
| switch { | ||
| case wantLuks: | ||
| // LUKS, or LUKS on RAID | ||
| rootDevice = "/dev/mapper/root" | ||
| case wantMirror: | ||
| // RAID without LUKS | ||
| rootDevice = "/dev/md/md-root" | ||
| default: | ||
| panic("can't happen") | ||
| } | ||
| rootFilesystem := types.Filesystem{ | ||
| Device: rootDevice, | ||
| Format: util.StrToPtr("xfs"), | ||
| Label: util.StrToPtr("root"), | ||
| WipeFilesystem: util.BoolToPtr(true), | ||
| } | ||
| renderedTranslations.AddFromCommonSource(path.New("yaml", "boot_device"), path.New("json", "storage", "filesystems", len(rendered.Storage.Filesystems)), rootFilesystem) | ||
| renderedTranslations.AddTranslation(path.New("yaml", "boot_device"), path.New("json", "storage", "filesystems")) | ||
| rendered.Storage.Filesystems = append(rendered.Storage.Filesystems, rootFilesystem) | ||
|
|
||
| // merge with translated config | ||
| renderedTranslations.AddTranslation(path.New("yaml", "boot_device"), path.New("json", "storage")) | ||
| retConfig, retTranslations := baseutil.MergeTranslatedConfigs(rendered, renderedTranslations, *config, *ts) | ||
| *config = retConfig.(types.Config) | ||
| *ts = retTranslations | ||
| return r | ||
| } | ||
|
|
||
| func translateBootDeviceLuks(from BootDeviceLuks, options common.TranslateOptions) (to types.Clevis, tm translate.TranslationSet, r report.Report) { | ||
| tr := translate.NewTranslator("yaml", "json", options) | ||
| tm, r = translate.Prefixed(tr, "tang", &from.Tang, &to.Tang) | ||
| translate.MergeP(tr, tm, &r, "threshold", &from.Threshold, &to.Threshold) | ||
| translate.MergeP(tr, tm, &r, "tpm2", &from.Tpm2, &to.Tpm2) | ||
| // we're being called manually, not via the translate package's | ||
| // custom translator mechanism, so we have to add the base | ||
| // translation ourselves | ||
| tm.AddTranslation(path.New("yaml"), path.New("json")) | ||
| return | ||
| } |
Oops, something went wrong.