-
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 remote-tracking branch 'upstream/main' into 477-import-selinux
- Loading branch information
Showing
40 changed files
with
2,381 additions
and
90 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
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,23 @@ | ||
| // Copyright 2022 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_0 | ||
|
|
||
| import ( | ||
| base "github.com/coreos/butane/base/v0_5" | ||
| ) | ||
|
|
||
| type Config struct { | ||
| base.Config `yaml:",inline"` | ||
| } |
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,54 @@ | ||
| // Copyright 2022 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_0 | ||
|
|
||
| import ( | ||
| "github.com/coreos/butane/config/common" | ||
| cutil "github.com/coreos/butane/config/util" | ||
|
|
||
| "github.com/coreos/ignition/v2/config/v3_4/types" | ||
| "github.com/coreos/vcontext/report" | ||
| ) | ||
|
|
||
| var ( | ||
| fieldFilters = cutil.NewFilters(types.Config{}, cutil.FilterMap{ | ||
| "kernelArguments": common.ErrGeneralKernelArgumentSupport, | ||
| "storage.disks": common.ErrDiskSupport, | ||
| "storage.filesystems": common.ErrFilesystemSupport, | ||
| "storage.luks": common.ErrLuksSupport, | ||
| "storage.raid": common.ErrRaidSupport, | ||
| }) | ||
| ) | ||
|
|
||
| // Return FieldFilters for this spec. | ||
| func (c Config) FieldFilters() *cutil.FieldFilters { | ||
| return &fieldFilters | ||
| } | ||
|
|
||
| // 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.1 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) | ||
| } |
Oops, something went wrong.