refactor: use chart values directly instead of attempting to template out cron-job and keda files
This commit is contained in:
4 files changed
+15
-11
No files matched your search
@@ -368,7 +368,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
|
||||
Processes: map[string]ProcessValues{},
|
||||
}
|
||||
|
||||
for authName := range kedaValues.Authentications {
|
||||
if len(kedaValues.Authentications) > 0 {
|
||||
templateFiles := []string{"keda-secret", "keda-trigger-authentication"}
|
||||
for _, templateName := range templateFiles {
|
||||
b, err := templates.ReadFile(fmt.Sprintf("templates/chart/%s.yaml", templateName))
|
||||
@@ -376,9 +376,8 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
|
||||
return fmt.Errorf("Error reading %s template: %w", templateName, err)
|
||||
}
|
||||
|
||||
filename := filepath.Join(chartDir, "templates", fmt.Sprintf("%s-%s.yaml", templateName, authName))
|
||||
contents := strings.ReplaceAll(string(b), "AUTH_NAME", authName)
|
||||
err = os.WriteFile(filename, []byte(contents), os.FileMode(0644))
|
||||
filename := filepath.Join(chartDir, "templates", fmt.Sprintf("%s.yaml", templateName))
|
||||
err = os.WriteFile(filename, b, os.FileMode(0644))
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error writing %s template: %w", templateName, err)
|
||||
}
|
||||
@@ -613,15 +612,16 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
|
||||
Volumes: processVolumes,
|
||||
}
|
||||
values.Processes[cronEntry.ID] = processValues
|
||||
}
|
||||
|
||||
if len(cronEntries) > 0 {
|
||||
b, err := templates.ReadFile("templates/chart/cron-job.yaml")
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error reading cron job template: %w", err)
|
||||
}
|
||||
|
||||
cronFile := filepath.Join(chartDir, "templates", fmt.Sprintf("cron-job-%s.yaml", cronEntry.ID))
|
||||
contents := strings.ReplaceAll(string(b), "CRON_ID", cronEntry.ID)
|
||||
err = os.WriteFile(cronFile, []byte(contents), os.FileMode(0644))
|
||||
cronFile := filepath.Join(chartDir, "templates", "cron-job.yaml")
|
||||
err = os.WriteFile(cronFile, b, os.FileMode(0644))
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error writing cron job template: %w", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user