Support installing extensions and rework OS update #1941
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,6 +103,18 @@ func MergeMachineConfigs(configs []*mcfgv1.MachineConfig, osImageURL string) (*m | |
| kargs = append(kargs, cfg.Spec.KernelArguments...) | ||
| } | ||
|
|
||
| extensions := []string{} | ||
| for _, cfg := range configs { | ||
| extensions = append(extensions, cfg.Spec.Extensions...) | ||
| } | ||
|
|
||
| // Ensure that kernel-devel extension is applied only with default kernel. | ||
| if kernelType != KernelTypeDefault { | ||
| if InSlice("kernel-devel", extensions) { | ||
| return nil, fmt.Errorf("installing kernel-devel extension is not supported with kernelType: %s", kernelType) | ||
| } | ||
| } | ||
|
|
||
| return &mcfgv1.MachineConfig{ | ||
| Spec: mcfgv1.MachineConfigSpec{ | ||
| OSImageURL: osImageURL, | ||
|
|
@@ -112,6 +124,7 @@ func MergeMachineConfigs(configs []*mcfgv1.MachineConfig, osImageURL string) (*m | |
| }, | ||
| FIPS: fips, | ||
| KernelType: kernelType, | ||
| Extensions: extensions, | ||
| }, | ||
| }, nil | ||
| } | ||
|
|
@@ -285,12 +298,41 @@ func ValidateIgnition(ignconfig interface{}) error { | |
| } | ||
| } | ||
|
|
||
| // InSlice search for an element in slice and return true if found, otherwise return false | ||
| func InSlice(elem string, slice []string) bool { | ||
|
There was a problem hiding this comment. can be unexported There was a problem hiding this comment. thanks for catching this, this was carried from work done in #1850. I missed updating inArray() call in update.go to InSlice(). Fixed https://github.com/openshift/machine-config-operator/pull/1941/files#diff-06961b075f1753956d802ba954d2cfb5R694 |
||
| for _, k := range slice { | ||
| if k == elem { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func validateExtensions(exts []string) error { | ||
| supportedExtensions := []string{"usbguard", "kernel-devel"} | ||
|
There was a problem hiding this comment. Could these be constants exported alongside the MC api types? If we could even add them to the CRD's openapi schema that'd be even better, so that users get immediate feedback on invalid extensions. Or maybe even have a There was a problem hiding this comment. Not very sure. The list of supported extensions is going to change whenever we add more extensions support in upcoming releases. In future, we are also exploring to add metadata for supported extension list in machine-os-content openshift/os#409 which MCO can read from and validate before rendering. |
||
| invalidExts := []string{} | ||
| for _, ext := range exts { | ||
| if !InSlice(ext, supportedExtensions) { | ||
| invalidExts = append(invalidExts, ext) | ||
| } | ||
| } | ||
| if len(invalidExts) != 0 { | ||
| return fmt.Errorf("invalid extensions found: %v", invalidExts) | ||
| } | ||
| return nil | ||
|
|
||
| } | ||
|
|
||
| // ValidateMachineConfig validates that given MachineConfig Spec is valid. | ||
| func ValidateMachineConfig(cfg mcfgv1.MachineConfigSpec) error { | ||
| if !(cfg.KernelType == "" || cfg.KernelType == KernelTypeDefault || cfg.KernelType == KernelTypeRealtime) { | ||
| return errors.Errorf("kernelType=%s is invalid", cfg.KernelType) | ||
| } | ||
|
|
||
| if err := validateExtensions(cfg.Extensions); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if cfg.Config.Raw != nil { | ||
| ignCfg, err := IgnParseWrapper(cfg.Config.Raw) | ||
| if err != nil { | ||
|
|
||
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,83 @@ | ||
| package daemon | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "math" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/containers/image/v5/docker" | ||
| "github.com/containers/image/v5/image" | ||
| "github.com/containers/image/v5/types" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| func retryIfNecessary(ctx context.Context, operation func() error) error { | ||
|
There was a problem hiding this comment. Any reason not to use k8s.io/client-go/util/retry? There was a problem hiding this comment. I followed the convention of what skopeo has been doing to retry https://github.com/containers/skopeo/blob/153f18dc0ac34e1adfc700806ef30af33187908b/cmd/skopeo/utils.go#L330 |
||
| err := operation() | ||
| for attempt := 0; err != nil && attempt < numRetriesNetCommands; attempt++ { | ||
| delay := time.Duration(int(math.Pow(2, float64(attempt)))) * time.Second | ||
| fmt.Printf("Warning: failed, retrying in %s ... (%d/%d)", delay, attempt+1, numRetriesNetCommands) | ||
| select { | ||
| case <-time.After(delay): | ||
| break | ||
| case <-ctx.Done(): | ||
| return err | ||
| } | ||
| err = operation() | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| // newDockerImageSource creates an image source for an image reference. | ||
| // The caller must call .Close() on the returned ImageSource. | ||
| func newDockerImageSource(ctx context.Context, sys *types.SystemContext, name string) (types.ImageSource, error) { | ||
| var imageName string | ||
| if !strings.HasPrefix(name, "//") { | ||
| imageName = "//" + name | ||
| } else { | ||
| imageName = name | ||
| } | ||
| ref, err := docker.ParseReference(imageName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return ref.NewImageSource(ctx, sys) | ||
| } | ||
|
|
||
| // This function has been inspired from upstream skopeo inspect, see https://github.com/containers/skopeo/blob/master/cmd/skopeo/inspect.go | ||
| // We can use skopeo inspect directly once fetching RepoTags becomes optional in skopeo. | ||
| func imageInspect(imageName string) (*types.ImageInspectInfo, error) { | ||
| var ( | ||
| src types.ImageSource | ||
| imgInspect *types.ImageInspectInfo | ||
| err error | ||
| ) | ||
|
|
||
| ctx := context.Background() | ||
| sys := &types.SystemContext{AuthFilePath: kubeletAuthFile} | ||
|
|
||
| if err := retryIfNecessary(ctx, func() error { | ||
| src, err = newDockerImageSource(ctx, sys, imageName) | ||
| return err | ||
| }); err != nil { | ||
| return nil, errors.Wrapf(err, "Error parsing image name %q", imageName) | ||
| } | ||
|
|
||
| defer src.Close() | ||
|
|
||
| img, err := image.FromUnparsedImage(ctx, sys, image.UnparsedInstance(src, nil)) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error parsing manifest for image: %v", err) | ||
| } | ||
|
|
||
| if err := retryIfNecessary(ctx, func() error { | ||
| imgInspect, err = img.Inspect(ctx) | ||
| return err | ||
| }); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return imgInspect, nil | ||
| } | ||
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.
any reason not to do:
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.
Not really, missed to refactor at the end in proper way. fixed
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 breaks OKD as it doesn't have
ocin FCOS image. Fromrelease-image.logon bootstrap node: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.
decided to follow up thanks Vadim 🙏 #1941 (comment)