Skip to content

Commit d197227

Browse files
authored
Make sure autoscaler crons get reinitialised regardless of provider type (#1984)
1 parent b0a0cb9 commit d197227

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

pkg/operator/main.go

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,43 @@ func main() {
6666
}
6767
}
6868

69-
deployments, err := config.K8s.ListDeploymentsWithLabelKeys("apiName")
70-
if err != nil {
71-
exit.Error(errors.Wrap(err, "init"))
72-
}
69+
cron.Run(batchapi.ManageJobResources, operator.ErrorHandler("manage batch jobs"), batchapi.ManageJobResourcesCronPeriod)
70+
}
71+
cron.Run(taskapi.ManageJobResources, operator.ErrorHandler("manage task jobs"), taskapi.ManageJobResourcesCronPeriod)
72+
73+
deployments, err := config.K8s.ListDeploymentsWithLabelKeys("apiName")
74+
if err != nil {
75+
exit.Error(errors.Wrap(err, "init"))
76+
}
77+
78+
for i := range deployments {
79+
deployment := deployments[i]
80+
apiKind := deployment.Labels["apiKind"]
81+
if userconfig.KindFromString(apiKind) == userconfig.RealtimeAPIKind ||
82+
userconfig.KindFromString(apiKind) == userconfig.AsyncAPIKind {
83+
apiID := deployment.Labels["apiID"]
84+
apiName := deployment.Labels["apiName"]
85+
api, err := operator.DownloadAPISpec(apiName, apiID)
86+
if err != nil {
87+
exit.Error(errors.Wrap(err, "init"))
88+
}
7389

74-
for i := range deployments {
75-
deployment := deployments[i]
76-
apiKind := deployment.Labels["apiKind"]
77-
if userconfig.KindFromString(apiKind) == userconfig.RealtimeAPIKind ||
78-
userconfig.KindFromString(apiKind) == userconfig.AsyncAPIKind {
79-
apiID := deployment.Labels["apiID"]
80-
apiName := deployment.Labels["apiName"]
81-
api, err := operator.DownloadAPISpec(apiName, apiID)
82-
if err != nil {
83-
exit.Error(errors.Wrap(err, "init"))
90+
switch apiKind {
91+
case userconfig.RealtimeAPIKind.String():
92+
if err := realtimeapi.UpdateAutoscalerCron(&deployment, api); err != nil {
93+
operatorLogger.Fatal(errors.Wrap(err, "init"))
94+
}
95+
case userconfig.AsyncAPIKind.String():
96+
if err := asyncapi.UpdateMetricsCron(&deployment); err != nil {
97+
operatorLogger.Fatal(errors.Wrap(err, "init"))
8498
}
8599

86-
switch apiKind {
87-
case userconfig.RealtimeAPIKind.String():
88-
if err := realtimeapi.UpdateAutoscalerCron(&deployment, api); err != nil {
89-
operatorLogger.Fatal(errors.Wrap(err, "init"))
90-
}
91-
case userconfig.AsyncAPIKind.String():
92-
if err := asyncapi.UpdateMetricsCron(&deployment); err != nil {
93-
operatorLogger.Fatal(errors.Wrap(err, "init"))
94-
}
95-
96-
if err := asyncapi.UpdateAutoscalerCron(&deployment, *api); err != nil {
97-
operatorLogger.Fatal(errors.Wrap(err, "init"))
98-
}
100+
if err := asyncapi.UpdateAutoscalerCron(&deployment, *api); err != nil {
101+
operatorLogger.Fatal(errors.Wrap(err, "init"))
99102
}
100103
}
101104
}
102-
103-
cron.Run(batchapi.ManageJobResources, operator.ErrorHandler("manage batch jobs"), batchapi.ManageJobResourcesCronPeriod)
104105
}
105-
cron.Run(taskapi.ManageJobResources, operator.ErrorHandler("manage task jobs"), taskapi.ManageJobResourcesCronPeriod)
106106

107107
router := mux.NewRouter()
108108

0 commit comments

Comments
 (0)