Skip to content

Commit 0bcb90b

Browse files
fix migrate vp (#149)
* fix migrate vp
1 parent 8f5d917 commit 0bcb90b

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
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": "1.3.5",
3+
"version": "1.3.6",
44

55
"description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
66
"main": "index.js",

venonactl/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.5
1+
1.3.6

venonactl/cmd/migrate.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ var migrateCmd = &cobra.Command{
3838
lgr := createLogger("Migrate", verbose, logFormatter)
3939
builder := plugins.NewBuilder(lgr)
4040
builder.Add(plugins.VenonaPluginType)
41+
builder.Add(plugins.RuntimeEnvironmentPluginType)
42+
builder.Add(plugins.VolumeProvisionerPluginType)
4143
s := store.GetStore()
4244
buildBasicStore(lgr)
4345
extendStoreWithKubeClient(lgr)
4446
extendStoreWithCodefershClient(lgr)
4547
extendStoreWithAgentAPI(lgr, "", "")
4648
fillKubernetesAPI(lgr, migrateCmdOpt.kube.context, migrateCmdOpt.kube.namespace, false)
4749
values := s.BuildValues()
50+
values["AppName"] = "venona" // use old app name for migration
4851
spn := createSpinner("Migrating runtime (might take a few seconds)", "")
4952
spn.Start()
5053
defer spn.Stop()

venonactl/pkg/plugins/runtime-environment.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ func (u *runtimeEnvironmentPlugin) Upgrade(_ *UpgradeOptions, v Values) (Values,
141141
return v, nil
142142
}
143143

144-
func (u *runtimeEnvironmentPlugin) Migrate(*MigrateOptions, Values) error {
145-
return fmt.Errorf("not supported")
144+
func (u *runtimeEnvironmentPlugin) Migrate(opt *MigrateOptions, v Values) error {
145+
return u.Delete(&DeleteOptions{
146+
ClusterNamespace: opt.ClusterNamespace,
147+
KubeBuilder: opt.KubeBuilder,
148+
}, v)
146149
}
147150

148151
func (u *runtimeEnvironmentPlugin) Test(opt TestOptions) error {

venonactl/pkg/plugins/venona.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ func (u *venonaPlugin) Migrate(opt *MigrateOptions, v Values) error {
226226
u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
227227
return err
228228
}
229-
v["AppName"] = "venona" // use old app name for migration
230229
kubeObjects, err := getKubeObjectsFromTempalte(v, venonaFilesPattern, u.logger)
231230
if err != nil {
232231
return err

venonactl/pkg/plugins/volume-provisioner.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,11 @@ func (u *volumeProvisionerPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values
108108
return v, nil
109109

110110
}
111-
func (u *volumeProvisionerPlugin) Migrate(*MigrateOptions, Values) error {
112-
return fmt.Errorf("not supported")
111+
func (u *volumeProvisionerPlugin) Migrate(opt *MigrateOptions, v Values) error {
112+
return u.Delete(&DeleteOptions{
113+
ClusterNamespace: opt.ClusterNamespace,
114+
KubeBuilder: opt.KubeBuilder,
115+
}, v)
113116
}
114117

115118
func (u *volumeProvisionerPlugin) Test(opt TestOptions) error {

0 commit comments

Comments
 (0)