Skip to content

Commit

Permalink
Render: Do not fail if there is no recommended profile.
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Ojosnegros Manchón <jojosneg@redhat.com>
  • Loading branch information
jlojosnegros committed Feb 7, 2024
1 parent b1a9df4 commit 7a0ddbe
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
24 changes: 12 additions & 12 deletions pkg/tuned/cmd/render/render.go
Expand Up @@ -128,7 +128,6 @@ func render(inputDir []string, outputDir string, mcpName string) error {
}
}
}

// Append any missing default manifests (i.e. `master`/`worker`)
mcPools = util.AppendMissingDefaultMCPManifests(mcPools)

Expand Down Expand Up @@ -160,17 +159,18 @@ func render(inputDir []string, outputDir string, mcpName string) error {
tuneD = append(tuneD, tunedFromPP)
}

recommendedProfile := ""
tuneDrecommended := operator.TunedRecommend(tuneD)
if len(tuneDrecommended) == 0 {
klog.Error("Unable to get tuned recommended profile.")
return fmt.Errorf("Unable to get tuned recommended profile.")
}
if len(tuneDrecommended) > 0 {
recommendedProfile = *tuneDrecommended[0].Profile
klog.Infof("RecommendedProfile found :%s", recommendedProfile)

recommendedProfile := *tuneDrecommended[0].Profile
err = tunedpkg.TunedRecommendFileWrite(recommendedProfile)
if err != nil {
klog.Errorf("error writing recommended profile %q : %v", recommendedProfile, err)
return fmt.Errorf("error writing recommended profile %q : %w", recommendedProfile, err)
err = tunedpkg.TunedRecommendFileWrite(recommendedProfile)
if err != nil {
klog.Warningf("error writing recommended profile %q : %v", recommendedProfile, err)
}
} else {
klog.Info("Unable to get tuned recommended profile.")
}

t := manifests.TunedRenderedResource(tuneD)
Expand All @@ -195,7 +195,7 @@ func render(inputDir []string, outputDir string, mcpName string) error {
return err
}

mc, err := renderMachineConfig(mcp, bootcmdline, mcConfigs, tuneDrecommended[0].MachineConfigLabels)
mc, err := renderMachineConfig(mcp, bootcmdline, mcConfigs, mcp.Spec.MachineConfigSelector.MatchLabels)
if err != nil {
klog.Errorf("error while rendering machine config %v", err)
return fmt.Errorf("error while rendering machine config: %w", err)
Expand All @@ -209,7 +209,7 @@ func render(inputDir []string, outputDir string, mcpName string) error {
return err
}

fileName := fmt.Sprintf("%s_%s_kargs.yaml", recommendedProfile, strings.ToLower(mc.Kind))
fileName := fmt.Sprintf("%s_%s_kargs.yaml", "kernelcmdargs", strings.ToLower(mc.Kind))
fullFilePath := filepath.Join(outputDir, fileName)
klog.Info("Writing file: ", fullFilePath)
err = os.WriteFile(fullFilePath, byteOutput, 0644)
Expand Down
11 changes: 7 additions & 4 deletions pkg/tuned/controller.go
Expand Up @@ -377,10 +377,13 @@ func ProfilesExtract(profiles []tunedv1.TunedProfile, recommendedProfile string)
)
klog.Info("profilesExtract(): extracting TuneD profiles")

// Get a list of TuneD profiles names the recommended profile depends on.
recommendedProfileDeps := profileDepends(recommendedProfile)
// Add the recommended profile itself.
recommendedProfileDeps[recommendedProfile] = true
recommendedProfileDeps := map[string]bool{}
if len(recommendedProfile) > 0 {
// Get a list of TuneD profiles names the recommended profile depends on.
recommendedProfileDeps = profileDepends(recommendedProfile)
// Add the recommended profile itself.
recommendedProfileDeps[recommendedProfile] = true
}
extracted := map[string]bool{} // TuneD profile names present in TuneD CR and successfully extracted to /etc/tuned/<profile>/

for index, profile := range profiles {
Expand Down

0 comments on commit 7a0ddbe

Please sign in to comment.