make flux bootstrap and install generation more consistent
Signed-off-by: Jack Evans <jack.evans1@ibm.com>
This commit is contained in:
@@ -84,7 +84,7 @@ func Generate(options Options, manifestsBase string) (*manifestgen.Manifest, err
|
||||
|
||||
return &manifestgen.Manifest{
|
||||
Path: path.Join(options.TargetPath, options.Namespace, options.ManifestFile),
|
||||
Content: string(content),
|
||||
Content: fmt.Sprintf("%s\n%s", GetGenWarning(options), string(content)),
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -142,3 +142,11 @@ func ExistingVersion(version string) (bool, error) {
|
||||
return false, fmt.Errorf("GitHub API returned an unexpected status code (%d)", res.StatusCode)
|
||||
}
|
||||
}
|
||||
|
||||
// GetGenWarning generates a consistent generation warning in the install and bootstrap case in the following format:
|
||||
// # This manifest was generated by flux. DO NOT EDIT.
|
||||
// # Flux version: v0.21.1
|
||||
// # Components: source-controller,kustomize-controller,helm-controller,notification-controller,image-reflector-controller,image-automation-controller
|
||||
func GetGenWarning(options Options) string {
|
||||
return fmt.Sprintf("---\n%s\n# Flux Version: %s\n# Components: %s", manifestgen.GenWarning, options.Version, strings.Join(options.Components, ","))
|
||||
}
|
||||
|
||||
@@ -41,5 +41,10 @@ func TestGenerate(t *testing.T) {
|
||||
t.Errorf("toleration key '%s' not found", opts.TolerationKeys[0])
|
||||
}
|
||||
|
||||
warning := GetGenWarning(opts)
|
||||
if !strings.HasPrefix(output.Content, warning) {
|
||||
t.Errorf("Generation warning '%s' not found", warning)
|
||||
}
|
||||
|
||||
fmt.Println(output)
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
securejoin "github.com/cyphar/filepath-securejoin"
|
||||
)
|
||||
|
||||
const GenWarning = "# This manifest was generated by flux bootstrap. DO NOT EDIT."
|
||||
const GenWarning = "# This manifest was generated by flux. DO NOT EDIT."
|
||||
|
||||
// Manifest holds the data of a multi-doc YAML
|
||||
type Manifest struct {
|
||||
|
||||
Reference in New Issue
Block a user