Skip to content

Commit 034e4e3

Browse files
author
Oleg Sucharevich
authored
Build annotations (#60)
1 parent 0e52769 commit 034e4e3

File tree

7 files changed

+39
-6
lines changed

7 files changed

+39
-6
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.27.1",
3+
"version": "0.28.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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ var installCmdOptions struct {
4949
runtimeEnvironmentName string
5050
kubernetesRunnerType bool
5151
buildNodeSelector string
52+
buildAnnotations []string
5253
}
5354

5455
// installCmd represents the install command
@@ -145,6 +146,17 @@ var installCmd = &cobra.Command{
145146
builderInstallOpt.KubeBuilder = getKubeClientBuilder(builderInstallOpt.ClusterName, s.KubernetesAPI.Namespace, s.KubernetesAPI.ConfigPath, s.KubernetesAPI.InCluster)
146147
builderInstallOpt.ClusterNamespace = s.KubernetesAPI.Namespace
147148

149+
annotations := make(map[string]string)
150+
for _, annotation := range installCmdOptions.buildAnnotations {
151+
v := strings.Split(annotation, "=")
152+
if len(v) != 2 {
153+
dieOnError(errors.New("annotations must be in form \"key=value\""))
154+
}
155+
annotations[v[0]] = v[1]
156+
}
157+
158+
builderInstallOpt.Annotations = annotations
159+
148160
bns, err := parseNodeSelector(installCmdOptions.buildNodeSelector)
149161
if err != nil {
150162
dieOnError(err)
@@ -177,6 +189,7 @@ func init() {
177189
installCmd.Flags().StringVar(&installCmdOptions.storageClass, "storage-class", "", "Set a name of your custom storage class, note: this will not install volume provisioning components")
178190
installCmd.Flags().StringVar(&installCmdOptions.kube.nodeSelector, "kube-node-selector", "", "The kubernetes node selector \"key=value\" to be used by venona resources (default is no node selector)")
179191
installCmd.Flags().StringVar(&installCmdOptions.buildNodeSelector, "build-node-selector", "", "The kubernetes node selector \"key=value\" to be used by venona build resources (default is no node selector)")
192+
installCmd.Flags().StringArrayVar(&installCmdOptions.buildAnnotations, "build-annotations", []string{}, "The kubernetes metadata.annotations as \"key=value\" to be used by venona build resources (default is no node selector)")
180193

181194
installCmd.Flags().BoolVar(&installCmdOptions.skipRuntimeInstallation, "skip-runtime-installation", false, "Set flag if you already have a configured runtime-environment, add --runtime-environment flag with name")
182195
installCmd.Flags().BoolVar(&installCmdOptions.kube.inCluster, "in-cluster", false, "Set flag if venona is been installed from inside a cluster")

‎venonactl/go.mod‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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/codefresh-io/go-sdk v0.16.0
6+
github.com/codefresh-io/go-sdk v0.17.0
77
github.com/dustin/go-humanize v1.0.0
88
github.com/google/go-github/v21 v21.0.0
99
github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 // indirect
@@ -25,17 +25,21 @@ require (
2525
github.com/spf13/afero v1.2.2 // indirect
2626
github.com/spf13/cobra v0.0.5
2727
github.com/spf13/jwalterweatherman v1.1.0 // indirect
28+
github.com/spf13/pflag v1.0.5 // indirect
2829
github.com/spf13/viper v1.4.0
2930
go.opencensus.io v0.19.0 // indirect
30-
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 // indirect
31+
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed // indirect
3132
golang.org/x/text v0.3.2 // indirect
3233
google.golang.org/appengine v1.4.0 // indirect
3334
gopkg.in/inf.v0 v0.9.0 // indirect
35+
gopkg.in/yaml.v2 v2.2.3 // indirect
3436
k8s.io/api v0.0.0-20181221193117-173ce66c1e39
3537
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
3638
k8s.io/client-go v10.0.0+incompatible
3739
k8s.io/klog v0.0.0-20181108234604-8139d8cb77af // indirect
3840
sigs.k8s.io/yaml v1.1.0 // indirect
3941
)
4042

41-
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20181218151757-9b75e4fe745a
43+
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20181218151757-9b75e4fe745a
44+
45+
go 1.13

‎venonactl/go.sum‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f
1818
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
1919
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
2020
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
21-
github.com/codefresh-io/go-sdk v0.16.0 h1:vj59hlmxTW8JIk/UOTvIgEsfa+xoHF8ck19H7WTZxac=
22-
github.com/codefresh-io/go-sdk v0.16.0/go.mod h1:U8c2f9/Vb2SXFbeKHSzofUOp3N78pDC3YdshFsUfdgc=
21+
github.com/codefresh-io/go-sdk v0.17.0 h1:0fwE4K0QeqM2VfyjiALzkH2se4HbLh9BiQCuzQnJH/U=
22+
github.com/codefresh-io/go-sdk v0.17.0/go.mod h1:b6hK9euSW+MDXUDHU1+YgP8vzcij749I31ZIZSXed+I=
2323
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
2424
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
2525
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@@ -113,6 +113,7 @@ github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/
113113
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
114114
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
115115
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
116+
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
116117
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
117118
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
118119
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -169,6 +170,8 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq
169170
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
170171
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
171172
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
173+
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
174+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
172175
github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
173176
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
174177
github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
@@ -227,6 +230,8 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
227230
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
228231
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 h1:41hwlulw1prEMBxLQSlMSux1zxJf07B3WPsdjJlKZxE=
229232
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
233+
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
234+
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
230235
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
231236
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
232237
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -267,6 +272,8 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
267272
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
268273
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
269274
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
275+
gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI=
276+
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
270277
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
271278
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
272279
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎venonactl/pkg/codefresh/cfapi.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type (
4343
IsDefaultStorageClass bool
4444
KubernetesRunnerType bool
4545
BuildNodeSelector map[string]string
46+
Annootaions map[string]string
4647
}
4748

4849
RuntimeEnvironmentRegistrator interface {
@@ -62,6 +63,7 @@ type (
6263
isDefaultStorageClass bool
6364
kubernetesRunnerType bool
6465
buildNodeSelector map[string]string
66+
annotations map[string]string
6567
}
6668

6769
logger interface {
@@ -86,6 +88,7 @@ func NewCodefreshAPI(opt *APIOptions) API {
8688
isDefaultStorageClass: opt.IsDefaultStorageClass,
8789
kubernetesRunnerType: opt.KubernetesRunnerType,
8890
buildNodeSelector: opt.BuildNodeSelector,
91+
annotations: opt.Annootaions,
8992
}
9093
}
9194

@@ -180,6 +183,10 @@ func (a *api) Register() (*codefresh.RuntimeEnvironment, error) {
180183
options.StorageClass = a.storageClass
181184
}
182185

186+
if len(a.annotations) != 0 {
187+
options.Annotations = a.annotations
188+
}
189+
183190
re, err := a.codefresh.RuntimeEnvironments().Create(options)
184191
if err != nil {
185192
return nil, err

‎venonactl/pkg/plugins/plugin.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ type (
5353
DryRun bool
5454
KubernetesRunnerType bool
5555
BuildNodeSelector map[string]string
56+
Annotations map[string]string
5657
}
5758

5859
DeleteOptions struct {

‎venonactl/pkg/plugins/runtime-environment.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ func (u *runtimeEnvironmentPlugin) Install(opt *InstallOptions, v Values) (Value
5353
IsDefaultStorageClass: opt.IsDefaultStorageClass,
5454
KubernetesRunnerType: opt.KubernetesRunnerType,
5555
BuildNodeSelector: opt.BuildNodeSelector,
56+
Annootaions: opt.Annotations,
5657
}
5758

5859
cf := codefresh.NewCodefreshAPI(cfOpt)

0 commit comments

Comments
 (0)