Skip to content

Commit f93ccd4

Browse files
delete venona deployment prior upgrade (#81)
* delete venona deployment prior upgrade
1 parent c18bd0f commit f93ccd4

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "venona",
3-
"version": "0.29.0",
3+
"version": "0.29.1",
44
"description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
55
"main": "index.js",
66
"scripts": {

venonactl/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.0
1+
0.29.1

venonactl/pkg/plugins/venona.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
120120
// avoid it till patch fully implemented
121121
var skipUpgradeFor = map[string]interface{}{
122122
"service-account.venona.yaml": nil,
123+
"deployment.venona.yaml": nil,
124+
}
125+
126+
var deletePriorUpgrade = map[string]interface{}{
127+
"deployment.venona.yaml": nil,
123128
}
124129

125130
var err error
@@ -147,6 +152,37 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
147152
}
148153

149154
for fileName, local := range kubeObjects {
155+
if _, ok := deletePriorUpgrade[fileName]; ok {
156+
u.logger.Debug(fmt.Sprintf("Deleting previous deplopyment of %s", fileName))
157+
delOpt := &deleteOptions{
158+
logger: u.logger,
159+
templates: templates.TemplatesMap(),
160+
templateValues: v,
161+
kubeClientSet: kubeClientset,
162+
namespace: opt.ClusterNamespace,
163+
matchPattern: fileName,
164+
operatorType: VenonaPluginType,
165+
}
166+
err := delete(delOpt)
167+
if err != nil {
168+
return nil, err
169+
}
170+
installOpt := &installOptions{
171+
logger: u.logger,
172+
templates: templates.TemplatesMap(),
173+
templateValues: v,
174+
kubeClientSet: kubeClientset,
175+
namespace: opt.ClusterNamespace,
176+
matchPattern: fileName,
177+
dryRun: opt.DryRun,
178+
operatorType: VenonaPluginType,
179+
}
180+
err = install(installOpt)
181+
if err != nil {
182+
return nil, err
183+
}
184+
}
185+
150186
if _, ok := skipUpgradeFor[fileName]; ok {
151187
u.logger.Debug(fmt.Sprintf("Skipping upgrade of %s: should be ignored", fileName))
152188
continue

0 commit comments

Comments
 (0)