fix: ensure we pass global labels

This commit is contained in:
Jose Diaz-Gonzalez committed 2024-03-01 17:42:24 -05:00
1 parent 45fbb7546f
commit 5e53207009
2 files changed
+7

No files matched your search

+1
View File
@@ -37,6 +37,7 @@ type GlobalValues struct {
AppName string `yaml:"app_name"` AppName string `yaml:"app_name"`
DeploymentID string `yaml:"deploment_id"` DeploymentID string `yaml:"deploment_id"`
Image GlobalImage `yaml:"image"` Image GlobalImage `yaml:"image"`
Labels ProcessLabels `yaml:"labels,omitempty"`
Namespace string `yaml:"namespace"` Namespace string `yaml:"namespace"`
Network GlobalNetwork `yaml:"network"` Network GlobalNetwork `yaml:"network"`
Secrets map[string]string `yaml:"secrets,omitempty"` Secrets map[string]string `yaml:"secrets,omitempty"`
+6
View File
@@ -261,6 +261,11 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
return fmt.Errorf("Error getting global annotations: %w", err) return fmt.Errorf("Error getting global annotations: %w", err)
} }
globalLabels, err := getGlobalLabel(appName)
if err != nil {
return fmt.Errorf("Error getting global labels: %w", err)
}
values := &AppValues{ values := &AppValues{
Global: GlobalValues{ Global: GlobalValues{
Annotations: globalAnnotations, Annotations: globalAnnotations,
@@ -273,6 +278,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
Type: imageSourceType, Type: imageSourceType,
WorkingDir: workingDir, WorkingDir: workingDir,
}, },
Labels: globalLabels,
Namespace: namespace, Namespace: namespace,
Network: GlobalNetwork{ Network: GlobalNetwork{
IngressClass: getGlobalIngressClass(), IngressClass: getGlobalIngressClass(),