Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord into feature/admiralty

This commit is contained in:
pb
2025-03-04 10:23:45 +01:00
29 changed files with 833 additions and 667 deletions

View File

@@ -60,8 +60,18 @@ type TemplateMetadata struct {
Labels map[string]string `yaml:"labels,omitempty"`
}
type Secret struct {
Name string `yaml:"name"`
Key string `yaml:"key"`
}
type Key struct {
Key string `yaml:"key"`
Key string `yaml:"key"`
Bucket string `yaml:"bucket"`
EndPoint string `yaml:"endpoint"`
Insecure bool `yaml:"insecure"`
AccessKeySecret *Secret `yaml accessKeySecret`
SecretKeySecret *Secret `yaml secretKeySecret`
}
type Artifact struct {
@@ -106,7 +116,7 @@ func (template *Template) CreateContainer(processing *resources.ProcessingResour
template.Outputs.Parameters = append(template.Inputs.Parameters, Parameter{Name: v.Name})
}
cmd := strings.ReplaceAll(inst.Access.Container.Command, container.Image, "")
container.Args = append(container.Args, "echo "+templateName+" && ") // a casual echo to know where we are for logs purpose
for _, a := range strings.Split(cmd, " ") {
container.Args = append(container.Args, template.ReplacePerEnv(a, inst.Env))
}