Skip to content

Commit

Permalink
Revert "Debug e2e not failing for ConfigMap feature"
Browse files Browse the repository at this point in the history
This reverts commit b409913.
  • Loading branch information
katyanna committed Dec 14, 2023
1 parent e6d2b13 commit 224d3e5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions controller/stackset.go
Original file line number Diff line number Diff line change
Expand Up @@ -1012,12 +1012,12 @@ func (c *StackSetController) ReconcileStackSetDesiredTraffic(ctx context.Context
}

func (c *StackSetController) ReconcileStackResources(ctx context.Context, ssc *core.StackSetContainer, sc *core.StackContainer) error {
// if c.configMapSupportEnabled {
// err := c.ReconcileStackConfigMap(ctx, sc.Stack, sc.Resources.ConfigMaps, sc.UpdateObjectMeta)
// if err != nil {
// return c.errorEventf(sc.Stack, "FailedManageConfigMap", err)
// }
// }
if c.configMapSupportEnabled {
err := c.ReconcileStackConfigMap(ctx, sc.Stack, sc.Resources.ConfigMaps, sc.UpdateObjectMeta)
if err != nil {
return c.errorEventf(sc.Stack, "FailedManageConfigMap", err)
}
}

err := c.ReconcileStackDeployment(ctx, sc.Stack, sc.Resources.Deployment, sc.GenerateDeployment)
if err != nil {
Expand Down

0 comments on commit 224d3e5

Please sign in to comment.