From 7b3b509a21b0d1b9cc24743485306ec6fb7be226 Mon Sep 17 00:00:00 2001 From: Simone Tiraboschi Date: Mon, 21 Dec 2020 18:15:34 +0100 Subject: [PATCH] test: force RollingUpgrade on all the deployments Signed-off-by: Simone Tiraboschi --- ...operator.v1.3.0.clusterserviceversion.yaml | 17 +++++++++++------ ...operator.v1.3.0.clusterserviceversion.yaml | 19 ++++++++++++------- tools/csv-merger/csv-merger.go | 8 ++++++++ 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml b/deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml index f61af75457..377d8c61ed 100644 --- a/deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml +++ b/deploy/index-image/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml @@ -1835,7 +1835,7 @@ spec: matchLabels: name: cluster-network-addons-operator strategy: - type: Recreate + type: RollingUpdate template: metadata: labels: @@ -1978,7 +1978,8 @@ spec: selector: matchLabels: name: kubevirt-ssp-operator - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2018,7 +2019,8 @@ spec: matchLabels: name: cdi-operator operator.cdi.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2069,7 +2071,8 @@ spec: selector: matchLabels: name: node-maintenance-operator - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2109,7 +2112,8 @@ spec: matchLabels: name: hostpath-provisioner-operator operator.hostpath-provisioner.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2144,7 +2148,8 @@ spec: matchLabels: name: vm-import-operator operator.v2v.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: diff --git a/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml b/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml index 74606e67ea..af9622f76c 100644 --- a/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/kubevirt-hyperconverged/1.3.0/kubevirt-hyperconverged-operator.v1.3.0.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: categories: OpenShift Optional certified: "false" containerImage: quay.io/kubevirt/hyperconverged-cluster-operator@sha256:0849ed82f0ea486ff5f0dd67ccf67d85e7a41bab263a2916311c530042dd9be6 - createdAt: "2020-12-20 10:42:21" + createdAt: "2020-12-21 18:14:00" description: |- **HyperConverged Cluster Operator** is an Operator pattern for managing multi-operator products. Specifcally, the HyperConverged Cluster Operator manages the deployment of KubeVirt, @@ -1835,7 +1835,7 @@ spec: matchLabels: name: cluster-network-addons-operator strategy: - type: Recreate + type: RollingUpdate template: metadata: labels: @@ -1978,7 +1978,8 @@ spec: selector: matchLabels: name: kubevirt-ssp-operator - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2018,7 +2019,8 @@ spec: matchLabels: name: cdi-operator operator.cdi.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2069,7 +2071,8 @@ spec: selector: matchLabels: name: node-maintenance-operator - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2109,7 +2112,8 @@ spec: matchLabels: name: hostpath-provisioner-operator operator.hostpath-provisioner.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: @@ -2144,7 +2148,8 @@ spec: matchLabels: name: vm-import-operator operator.v2v.kubevirt.io: "" - strategy: {} + strategy: + type: RollingUpdate template: metadata: labels: diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go index 4314ce1675..4d48ed02ac 100644 --- a/tools/csv-merger/csv-merger.go +++ b/tools/csv-merger/csv-merger.go @@ -25,6 +25,7 @@ import ( "flag" "fmt" "io/ioutil" + appsv1 "k8s.io/api/apps/v1" "log" "os" "path/filepath" @@ -338,6 +339,7 @@ func main() { // TODO: remove this once fixed on OLM side for _, deployment := range strategySpec.DeploymentSpecs { delete(deployment.Spec.Template.Annotations, "description") + } installStrategyBase.DeploymentSpecs = append(installStrategyBase.DeploymentSpecs, strategySpec.DeploymentSpecs...) @@ -421,6 +423,12 @@ func main() { csvExtended.Spec.InstallStrategy.StrategyName = "deployment" csvExtended.Spec.InstallStrategy.StrategySpec = *installStrategyBase + // TODO: try forcing RollingUpdate strategy on all the deployment to + // bypass an upgrade bug + for i, _ := range csvExtended.Spec.InstallStrategy.StrategySpec.DeploymentSpecs { + csvExtended.Spec.InstallStrategy.StrategySpec.DeploymentSpecs[i].Spec.Strategy.Type = appsv1.RollingUpdateDeploymentStrategyType + } + if *metadataDescription != "" { csvExtended.Annotations["description"] = *metadataDescription }