Skip to content

Commit

Permalink
upgrade zync database metering label only when not external
Browse files Browse the repository at this point in the history
  • Loading branch information
eguzki committed Nov 15, 2021
1 parent 9c460cb commit af08577
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/3scale/amp/operator/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,6 @@ func (u *UpgradeApiManager) upgradePodTemplateLabels() (reconcile.Result, error)
backend.CronDeploymentConfig(),
zync.DeploymentConfig(),
zync.QueDeploymentConfig(),
zync.DatabaseDeploymentConfig(),
memcached.DeploymentConfig(),
system.AppDeploymentConfig(),
system.SidekiqDeploymentConfig(),
Expand Down Expand Up @@ -828,6 +827,11 @@ func (u *UpgradeApiManager) upgradePodTemplateLabels() (reconcile.Result, error)
}
deploymentConfigs = append(deploymentConfigs, systemMySQL.DeploymentConfig())
}

if !u.apiManager.IsZyncExternalDatabaseEnabled() {
deploymentConfigs = append(deploymentConfigs, zync.DatabaseDeploymentConfig())
}

updated := false
for _, desired := range deploymentConfigs {
updatedTmp, err := u.ensurePodTemplateLabels(desired)
Expand Down

0 comments on commit af08577

Please sign in to comment.