Skip to content

Commit b7a6a70

Browse files
author
Oleg Sucharevich
authored
make sure to pass the right namespace during upgrade process (#53)
1 parent 54f667c commit b7a6a70

File tree

3 files changed

+9
-7
lines changed

3 files changed

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

venonactl/cmd/upgrade.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ var upgradeCmd = &cobra.Command{
5353
extendStoreWithKubeClient(lgr)
5454
builder := plugins.NewBuilder(lgr)
5555
builderUpgradeOpt := &plugins.UpgradeOptions{
56-
CodefreshHost: s.CodefreshAPI.Host,
57-
CodefreshToken: s.CodefreshAPI.Token,
58-
ClusterNamespace: s.KubernetesAPI.Namespace,
59-
DryRun: upgradeCmdOpt.dryRun,
60-
Name: s.AppName,
56+
CodefreshHost: s.CodefreshAPI.Host,
57+
CodefreshToken: s.CodefreshAPI.Token,
58+
DryRun: upgradeCmdOpt.dryRun,
59+
Name: s.AppName,
6160
}
6261

6362
re, _ := s.CodefreshAPI.Client.RuntimeEnvironments().Get(args[0])
@@ -67,6 +66,9 @@ var upgradeCmd = &cobra.Command{
6766
}
6867
s.KubernetesAPI.ContextName = contextName
6968
s.KubernetesAPI.Namespace = re.RuntimeScheduler.Cluster.Namespace
69+
70+
builderUpgradeOpt.ClusterNamespace = s.KubernetesAPI.Namespace
71+
7072
if upgradeCmdOpt.dryRun {
7173
lgr.Info("Running in dry-run mode")
7274
} else {

venonactl/pkg/plugins/venona.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (u *venonaPlugin) Upgrade(opt *UpgradeOptions, v Values) (Values, error) {
139139
return nil, err
140140
}
141141
token := secret.Data["codefresh.token"]
142-
v["AgentToken"] = string(token)
142+
v["AgentToken"] = base64.StdEncoding.EncodeToString([]byte(token))
143143

144144
kubeObjects, err := getKubeObjectsFromTempalte(v, venonaFilesPattern, u.logger)
145145
if err != nil {

0 commit comments

Comments
 (0)