Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
k8s
devtool
Commits
69f144b2
Commit
69f144b2
authored
Mar 22, 2019
by
SWE CI
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v0.1.2'
parents
5a1cc848
42f3d28d
Pipeline
#29299
passed with stage
in 23 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
cmd/ci.go
cmd/ci.go
+2
-2
cmd/ci_deploy.go
cmd/ci_deploy.go
+2
-3
No files found.
cmd/ci.go
View file @
69f144b2
...
...
@@ -42,12 +42,12 @@ func init() {
// configCmd.PersistentFlags().String("foo", "", "A help for foo")
ciCmd
.
PersistentFlags
()
.
StringVarP
(
&
dockerRegistry
,
"registry"
,
"r"
,
""
,
"url of the docker registry"
)
ciCmd
.
PersistentFlags
()
.
StringVarP
(
&
dockerRegistryNamespace
,
"registry-namespace"
,
"n"
,
""
,
"namespace in the docker registry"
)
ciCmd
.
PersistentFlags
()
.
StringVarP
(
&
imageTag
,
"image"
,
"i"
,
""
,
"image tag for docker"
)
ciCmd
.
PersistentFlags
()
.
StringVarP
(
&
imageTag
,
"image
-tag
"
,
"i"
,
""
,
"image tag for docker"
)
ciCmd
.
PersistentFlags
()
.
StringVarP
(
&
environmentSuffix
,
"environment"
,
"e"
,
""
,
"environment suffix to append to helm release name"
)
ciCmd
.
MarkPersistentFlagRequired
(
"registry"
)
ciCmd
.
MarkPersistentFlagRequired
(
"registry-namespace"
)
ciCmd
.
MarkPersistentFlagRequired
(
"image"
)
ciCmd
.
MarkPersistentFlagRequired
(
"image
-tag
"
)
// Cobra supports local flags which will only run when this command
// is called directly, e.g.:
...
...
cmd/ci_deploy.go
View file @
69f144b2
...
...
@@ -63,8 +63,7 @@ func fluxDeployCi(config config.Config) error {
for
_
,
deployable
:=
range
config
.
Deployables
{
image
:=
deployable
.
Name
dockerImage
:=
dockerRegistry
+
"/"
+
dockerRegistryNamespace
+
"/"
+
image
dockerTag
:=
dockerImage
+
":"
+
imageTag
dockerImageTag
:=
image
+
":"
+
imageTag
var
releaseName
string
if
environmentSuffix
==
""
{
...
...
@@ -75,7 +74,7 @@ func fluxDeployCi(config config.Config) error {
color
.
Blue
(
"Updating Flux Release:"
,
releaseName
)
os
.
Setenv
(
"KUBE_SERVICE_NAME"
,
releaseName
)
os
.
Setenv
(
"DOCKER_IMAGE_TAG"
,
dockerTag
)
os
.
Setenv
(
"DOCKER_IMAGE_TAG"
,
docker
Image
Tag
)
os
.
Setenv
(
"CI_PROJECT_NAME"
,
image
)
err
:=
environment
.
Run
(
true
,
"fluxhelmrelease"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment