Skip to content

Commit 93d797e

Browse files
authored
Reconcile first ingress resources. (#582)
Signed-off-by: Rodrigo Reis <[email protected]>
1 parent cc42b67 commit 93d797e

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

controller/stackset.go

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,36 +1264,7 @@ func (c *StackSetController) ReconcileStackSetDesiredTraffic(ctx context.Context
12641264
}
12651265

12661266
func (c *StackSetController) ReconcileStackResources(ctx context.Context, ssc *core.StackSetContainer, sc *core.StackContainer) error {
1267-
if c.configMapSupportEnabled {
1268-
err := c.ReconcileStackConfigMap(ctx, sc.Stack, sc.Resources.ConfigMaps, sc.UpdateObjectMeta)
1269-
if err != nil {
1270-
return c.errorEventf(sc.Stack, "FailedManageConfigMap", err)
1271-
}
1272-
}
1273-
1274-
if c.secretSupportEnabled {
1275-
err := c.ReconcileStackSecret(ctx, sc.Stack, sc.Resources.Secrets, sc.UpdateObjectMeta)
1276-
if err != nil {
1277-
return c.errorEventf(sc.Stack, "FailedManageSecret", err)
1278-
}
1279-
}
1280-
1281-
err := c.ReconcileStackDeployment(ctx, sc.Stack, sc.Resources.Deployment, sc.GenerateDeployment)
1282-
if err != nil {
1283-
return c.errorEventf(sc.Stack, "FailedManageDeployment", err)
1284-
}
1285-
1286-
err = c.ReconcileStackHPA(ctx, sc.Stack, sc.Resources.HPA, sc.GenerateHPA)
1287-
if err != nil {
1288-
return c.errorEventf(sc.Stack, "FailedManageHPA", err)
1289-
}
1290-
1291-
err = c.ReconcileStackService(ctx, sc.Stack, sc.Resources.Service, sc.GenerateService)
1292-
if err != nil {
1293-
return c.errorEventf(sc.Stack, "FailedManageService", err)
1294-
}
1295-
1296-
err = c.ReconcileStackIngress(ctx, sc.Stack, sc.Resources.Ingress, sc.GenerateIngress)
1267+
err := c.ReconcileStackIngress(ctx, sc.Stack, sc.Resources.Ingress, sc.GenerateIngress)
12971268
if err != nil {
12981269
return c.errorEventf(sc.Stack, "FailedManageIngress", err)
12991270
}
@@ -1335,6 +1306,35 @@ func (c *StackSetController) ReconcileStackResources(ctx context.Context, ssc *c
13351306
}
13361307
}
13371308

1309+
if c.configMapSupportEnabled {
1310+
err = c.ReconcileStackConfigMap(ctx, sc.Stack, sc.Resources.ConfigMaps, sc.UpdateObjectMeta)
1311+
if err != nil {
1312+
return c.errorEventf(sc.Stack, "FailedManageConfigMap", err)
1313+
}
1314+
}
1315+
1316+
if c.secretSupportEnabled {
1317+
err := c.ReconcileStackSecret(ctx, sc.Stack, sc.Resources.Secrets, sc.UpdateObjectMeta)
1318+
if err != nil {
1319+
return c.errorEventf(sc.Stack, "FailedManageSecret", err)
1320+
}
1321+
}
1322+
1323+
err = c.ReconcileStackDeployment(ctx, sc.Stack, sc.Resources.Deployment, sc.GenerateDeployment)
1324+
if err != nil {
1325+
return c.errorEventf(sc.Stack, "FailedManageDeployment", err)
1326+
}
1327+
1328+
err = c.ReconcileStackHPA(ctx, sc.Stack, sc.Resources.HPA, sc.GenerateHPA)
1329+
if err != nil {
1330+
return c.errorEventf(sc.Stack, "FailedManageHPA", err)
1331+
}
1332+
1333+
err = c.ReconcileStackService(ctx, sc.Stack, sc.Resources.Service, sc.GenerateService)
1334+
if err != nil {
1335+
return c.errorEventf(sc.Stack, "FailedManageService", err)
1336+
}
1337+
13381338
return nil
13391339
}
13401340

0 commit comments

Comments
 (0)