Skip to content

Commit f690ccd

Browse files
Merge pull request #1027 from ecordell/depup
Bug 1750980: feat(olm): don't calculate a patch when updating via a replacement chain
2 parents 95572bc + cbcc50c commit f690ccd

File tree

3 files changed

+422
-209
lines changed

3 files changed

+422
-209
lines changed

pkg/api/wrappers/deployment_install_client.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,18 @@ func (c *InstallStrategyDeploymentClientForNamespace) DeleteDeployment(name stri
9797
}
9898

9999
func (c *InstallStrategyDeploymentClientForNamespace) CreateOrUpdateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error) {
100-
d, _, err := c.opClient.CreateOrRollingUpdateDeployment(deployment)
101-
return d, err
100+
_, err := c.opClient.GetDeployment(deployment.Namespace, deployment.Name)
101+
if err != nil {
102+
if !apierrors.IsNotFound(err) {
103+
return nil, err
104+
}
105+
created, err := c.CreateDeployment(deployment)
106+
if err != nil {
107+
return nil, err
108+
}
109+
return created, err
110+
}
111+
return c.opClient.KubernetesInterface().AppsV1().Deployments(deployment.GetNamespace()).Update(deployment)
102112
}
103113

104114
func (c *InstallStrategyDeploymentClientForNamespace) GetServiceAccountByName(serviceAccountName string) (*corev1.ServiceAccount, error) {

0 commit comments

Comments
 (0)