Skip to content

Commit 823e77e

Browse files
Merge pull request #69 from codefresh-io/vp_upgrade
support upgrade for volume provisioner
2 parents 92ce18b + 719fb15 commit 823e77e

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
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.28.3",
3+
"version": "0.28.4",
44
"description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
55
"main": "index.js",
66
"scripts": {

venonactl/cmd/install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,10 @@ func parseNodeSelector(s string) (nodeSelector, error) {
225225

226226
func validateInstallOptions(opts* plugins.InstallOptions) (error) {
227227
if len(opts.ClusterName) > clusterNameMaxLength {
228-
return errors.New(fmt.Sprintf("cluster name lenght is limited to %d", clusterNameMaxLength))
228+
return errors.New(fmt.Sprintf("cluster name length is limited to %d", clusterNameMaxLength))
229229
}
230230
if len(opts.ClusterNamespace) > namespaceMaxLength {
231-
return errors.New(fmt.Sprintf("cluster namespace is limited to %d", namespaceMaxLength))
231+
return errors.New(fmt.Sprintf("cluster namespace length is limited to %d", namespaceMaxLength))
232232
}
233233
return nil
234234
}

venonactl/pkg/plugins/volume-provisioner.go

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121

2222
"github.com/codefresh-io/venona/venonactl/pkg/logger"
23+
"github.com/codefresh-io/venona/venonactl/pkg/obj/kubeobj"
2324
templates "github.com/codefresh-io/venona/venonactl/pkg/templates/kubernetes"
2425
)
2526

@@ -86,6 +87,24 @@ func (u *volumeProvisionerPlugin) Delete(deleteOpt *DeleteOptions, v Values) err
8687
return delete(opt)
8788
}
8889

89-
func (u *volumeProvisionerPlugin) Upgrade(_ *UpgradeOptions, v Values) (Values, error) {
90+
func (u *volumeProvisionerPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
91+
var err error
92+
kubeClientset, err := opt.KubeBuilder.BuildClient()
93+
if err != nil {
94+
u.logger.Error(fmt.Sprintf("Cannot create kubernetes clientset: %v ", err))
95+
return nil, err
96+
}
97+
kubeObjects, err := getKubeObjectsFromTempalte(v, volumeProvisionerFilesPattern, u.logger)
98+
if err != nil {
99+
return nil, err
100+
}
101+
for _, local := range kubeObjects {
102+
103+
_, _, err := kubeobj.ReplaceObject(kubeClientset, local, opt.ClusterNamespace)
104+
if err != nil {
105+
return nil, err
106+
}
107+
}
90108
return v, nil
109+
91110
}

venonactl/pkg/store/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (s *Values) BuildValues() map[string]interface{} {
9595
},
9696
"VolumeProvisionerImage": map[string]string{
9797
"Name": "codefresh/dind-volume-provisioner",
98-
"Tag": "v13",
98+
"Tag": "v17",
9999
},
100100
"Namespace": s.KubernetesAPI.Namespace,
101101
"NodeSelector": s.KubernetesAPI.NodeSelector,

0 commit comments

Comments
 (0)