Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the variables loading function public #841

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Make the variables loading function public #841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions kustomize/kustomize_varsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func SubstituteVariables(
// But if the user is using dryRun, he/she should know what he/she is doing, and we should comply.
var vars map[string]string
if !options.DryRun {
vars, err = loadVars(ctx, kubeClient, kustomization)
vars, err = LoadVariables(ctx, kubeClient, kustomization)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -137,7 +137,9 @@ func SubstituteVariables(
return res, nil
}

func loadVars(ctx context.Context, kubeClient client.Client, kustomization unstructured.Unstructured) (map[string]string, error) {
// LoadVariables reads the in-line variables set in the Flux Kustomization and merges them with
// the vars referred in ConfigMaps and Secrets data keys.
func LoadVariables(ctx context.Context, kubeClient client.Client, kustomization unstructured.Unstructured) (map[string]string, error) {
vars := make(map[string]string)
substituteFrom, err := getSubstituteFrom(kustomization)
if err != nil {
Expand Down
Loading