Skip to content

Commit 1d740fa

Browse files
author
Oleg Sucharevich
authored
support setting the runtime environment to default one in install cmd
1 parent c660db9 commit 1d740fa

File tree

6 files changed

+42
-18
lines changed

6 files changed

+42
-18
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.10.0",
3+
"version": "0.11.0",
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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ var (
3636
dryRun bool
3737
skipRuntimeInstallation bool
3838
installOnlyRuntimeEnvironment bool
39+
setDefaultRuntime bool
3940
)
4041

4142
// installCmd represents the install command
@@ -103,6 +104,7 @@ func init() {
103104
installCmd.Flags().BoolVar(&dryRun, "dry-run", false, "Set to true to simulate installation")
104105
installCmd.Flags().String("kube-namespace", "default", "Name of the namespace on which venona should be installed")
105106
installCmd.Flags().String("kube-context-name", "", "Name of the kubernetes context on which venona should be installed (default is current-context)")
107+
installCmd.Flags().BoolVar(&setDefaultRuntime, "set-default", false, "Mark the install runtime-environment as default one after installation")
106108
}
107109

108110
func installRuntimeEnvironment() {
@@ -116,9 +118,10 @@ func installRuntimeEnvironment() {
116118
err = runtimectl.GetOperator(runtimectl.RuntimeEnvironmentOperatorType).Install()
117119
internal.DieOnError(err)
118120

119-
err = cfAPI.Register()
121+
err = cfAPI.Register(&codefresh.RegisterOptions{
122+
MarkDefaultRuntime: setDefaultRuntime,
123+
})
120124
internal.DieOnError(err)
121-
122125
}
123126

124127
func installvenona() {

‎venonactl/go.mod‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ module github.com/codefresh-io/venona/venonactl
33
require (
44
contrib.go.opencensus.io/exporter/ocagent v0.4.3 // indirect
55
github.com/Azure/go-autorest v11.4.0+incompatible // indirect
6-
github.com/BurntSushi/toml v0.3.1 // indirect
7-
github.com/codefresh-io/go-sdk v0.5.1
6+
github.com/codefresh-io/go-sdk v0.8.1
87
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
98
github.com/dustin/go-humanize v1.0.0
10-
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 // indirect
9+
github.com/gogo/protobuf v1.2.0 // indirect
1110
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
1211
github.com/google/go-github/v21 v21.0.0
1312
github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 // indirect
@@ -16,15 +15,13 @@ require (
1615
github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 // indirect
1716
github.com/hashicorp/go-version v1.1.0
1817
github.com/imdario/mergo v0.3.5 // indirect
19-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
2018
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
21-
github.com/mattn/go-runewidth v0.0.4 // indirect
19+
github.com/kr/pretty v0.1.0 // indirect
2220
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2321
github.com/modern-go/reflect2 v1.0.1 // indirect
2422
github.com/olekukonko/tablewriter v0.0.1
2523
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
2624
github.com/sirupsen/logrus v1.3.0
27-
github.com/spf13/afero v1.2.0 // indirect
2825
github.com/spf13/cobra v0.0.3
2926
github.com/spf13/viper v1.3.1
3027
go.opencensus.io v0.19.0 // indirect

‎venonactl/go.sum‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
1414
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 h1:gUqsFVdUKoRHNg8fkFd8gB5OOEa/g5EwlAHznb4zjbI=
1515
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
1616
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
17-
github.com/codefresh-io/go-sdk v0.5.1 h1:vWAIx/bIpmFuhagTiyQN/RvVe2uo1YpCRWbpW6TY0DE=
18-
github.com/codefresh-io/go-sdk v0.5.1/go.mod h1:Wqmho6iRuXioLDlIxGFqJV2pv+AvSglTDgmyLC+QDew=
17+
github.com/codefresh-io/go-sdk v0.8.1 h1:kNzn9FIQIhwi7GLNVD38QdbOSmO7kJv1xBupvHjZbZ0=
18+
github.com/codefresh-io/go-sdk v0.8.1/go.mod h1:U8c2f9/Vb2SXFbeKHSzofUOp3N78pDC3YdshFsUfdgc=
1919
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
2020
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
2121
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -28,8 +28,9 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
2828
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
2929
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
3030
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
31-
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM=
32-
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
31+
github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
32+
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
33+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
3334
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
3435
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
3536
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -38,6 +39,7 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
3839
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
3940
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
4041
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
42+
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
4143
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
4244
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
4345
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -69,11 +71,17 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBv
6971
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
7072
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
7173
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
74+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
75+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
76+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
77+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
78+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
7279
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
7380
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
7481
github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
7582
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
7683
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
84+
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
7785
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
7886
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
7987
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -152,6 +160,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h
152160
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
153161
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
154162
golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
163+
golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
155164
golang.org/x/sys v0.0.0-20190107173414-20be8e55dc7b h1:9Gu1sMPgKHo+qCbPa2jN5A54ro2gY99BWF7nHOBNVME=
156165
golang.org/x/sys v0.0.0-20190107173414-20be8e55dc7b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
157166
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
@@ -178,6 +187,7 @@ google.golang.org/grpc v1.17.0 h1:TRJYBgMclJvGYn2rIMjj+h9KtMt5r1Ij7ODVRIZkwhk=
178187
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
179188
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
180189
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
190+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
181191
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
182192
gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o=
183193
gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=

‎venonactl/hack/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -e
3-
OUTFILE=${GOPATH}/bin/venonactl
3+
OUTFILE=/usr/local/bin/venonactl
44
go generate ${PWD}/hack/generate.go
55
go build -ldflags '-X github.com/codefresh-io/venona/venonactl/cmd.localDevFlow=true' -o $OUTFILE main.go
66

‎venonactl/pkg/codefresh/cfapi.go‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@ const (
3939
userAgent = "venona-ctl"
4040
)
4141

42-
// CfAPI struct to call Codefresh API
43-
type CfAPI struct {
44-
}
42+
type (
43+
// CfAPI struct to call Codefresh API
44+
CfAPI struct {
45+
}
46+
47+
RegisterOptions struct {
48+
MarkDefaultRuntime bool
49+
}
50+
)
4551

4652
// New - constructs CfAPI
4753
func New() *CfAPI {
@@ -137,7 +143,7 @@ func (u *CfAPI) Sign() error {
137143
}
138144

139145
// Register calls codefresh API to register runtimectl environment
140-
func (u *CfAPI) Register() error {
146+
func (u *CfAPI) Register(opt *RegisterOptions) error {
141147
logrus.Debug("Entering codefresh.Register")
142148
s := store.GetStore()
143149
options := &codefresh.CreateRuntimeOptions{
@@ -166,5 +172,13 @@ func (u *CfAPI) Register() error {
166172
s.RuntimeEnvironment = re.Metadata.Name
167173
logrus.Debugf("Created with name: %s", re.Metadata.Name)
168174

175+
if opt.MarkDefaultRuntime {
176+
logrus.Debug("Setting runtime as deault")
177+
_, err := cf.RuntimeEnvironments().Default(re.Metadata.Name)
178+
if err != nil {
179+
return err
180+
}
181+
}
182+
169183
return nil
170184
}

0 commit comments

Comments
 (0)