Generate buildconfig for Openshift #206
Conversation
|
rebase please |
rtnpro
force-pushed
the
buildconfig
branch
4 times, most recently
from
b286f9f
to
795535f
Compare
| @@ -23,7 +23,7 @@ import ( | |||
| ) | |||
|
|
|||
| var unsupportedKey = map[string]int{ | |||
| "Build": 0, | |||
| // "Build": 0, | |||
There was a problem hiding this comment.
We need to have provider based checks for unsupported keys, as, build is now supported for openshift but not for kubernetes.
| Ref: "master", | ||
| URI: getGitRemote("origin"), | ||
| }, | ||
| ContextDir: "./", |
There was a problem hiding this comment.
The value for ContextDir cannot be value of build or build.context from Docker Compose file. There may be cases where the compose file is not at the root directory of the project. In that case, we evaluate the path relative from the root directory of the project, instead, of the relative path from the compose file.
There was a problem hiding this comment.
There is also case (and this is most cases) where build context is in dir, so we have to detect where this dir is relative to root of git repo.
Look at this example: https://github.com/kadel/compose-build-test
rtnpro
changed the title
| @@ -55,6 +57,15 @@ func getImageTag(image string) string { | |||
| } | |||
| } | |||
|
|
|||
| // getGitRemote gets git remote URI for the current git repo | |||
| func getGitRemote(remote string) string { | |||
| out, err := exec.Command("git", "remote", "get-url", remote).Output() | |||
There was a problem hiding this comment.
I don't know about this :-(
Is it possible to do it without calling external binary?
There was a problem hiding this comment.
It might be worth looking how OpenShift/oc is doing it! Maybe reading from .git/config in root directory?
There was a problem hiding this comment.
We are sticking to os/exec as used by openshift itself.
| if err != nil { | ||
| return "" | ||
| } | ||
| return string(out) |
There was a problem hiding this comment.
I think this is returning string with \n at the end. Or at least this is what i got in BuildConfig spec.source.git.uri
| Ref: "master", | ||
| URI: getGitRemote("origin"), | ||
| }, | ||
| ContextDir: "./", |
There was a problem hiding this comment.
There is also case (and this is most cases) where build context is in dir, so we have to detect where this dir is relative to root of git repo.
Look at this example: https://github.com/kadel/compose-build-test
| {Type: "ImageChange"}, | ||
| }, | ||
| // RunPolicy | ||
| "serial", |
| @@ -150,6 +207,10 @@ func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C | |||
| objects = append(objects, initImageStream(name, service)) | |||
| } | |||
|
|
|||
| if opt.CreateBuildConfig && service.Build != "" { | |||
| objects = append(objects, initBuildConfig(name, service)) // Openshift BuildConfigs | |||
There was a problem hiding this comment.
You also need to modify ImageStream that is created few lines above, you cannot use it as it is right now with builds.
|
@dustymabe 23536de fixes the issue you reported! |
|
@kadel @surajssd could you review this pull request once again? The generated artifacts now work with openshift as is. I am looking at how to replace doing system calls to
|
|
@rtnpro so I tried to build on the latest branch today and saw that user can provide custom remote using A docker-compose file can have multiple services and each service can be a project in itself! |
|
@rtnpro I tried this build on OpenShift online Convert: $ kompose --provider openshift convert --stdout -y --bc > output.yml
WARN[0000] [foo] Service cannot be created because of missing port. and create objects in online $ oc new-project alm
$ oc create -f output.yml
deploymentconfig "foo" created
imagestream "foo" created
Error from server: buildconfigs "foo" is forbidden: build strategy Docker is not allowedIt's not allowing build-strategy docker in openshift online. Will give it one try on OpenShift running locally. |
rtnpro
force-pushed
the
buildconfig
branch
2 times, most recently
from
dd0cc68
to
724930b
Compare
k8s-ci-robot
added
the
cncf-cla: yes
rtnpro
force-pushed
the
buildconfig
branch
2 times, most recently
from
fda463e
to
1115315
Compare
|
Can you please rebase. |
with older git-2.6.x
Go vet warning was 'composite liternal uses unkeyed fields'.
based on review.
Added: - github.com/openshift/origin/pkg/build/api/install - github.com/openshift/origin/pkg/build/api/v1
|
@rtnpro two things now $ kompose --provider openshift convert -o config/ --build-repo https://github.com/rtnpro/kompose
WARN[0000] [foo] Service cannot be created because of missing port.
INFO[0000] Buildconfig using https://github.com/rtnpro/kompose:: as source.
<snip>It is correctly reading the branch but then it is not showing up as you can see in last line. It is still not pushing to internal registry! I see following things in status $ oc status -v
In project simple on server https://192.168.121.103:8443
dc/foo deploys istag/foo:latest <- bc/foo docker builds https://github.com/rtnpro/kompose#buildconfig
build #1 failed 2 minutes ago - 8ed07fc: Fixed typos in openshift buildconfig. (Ratnadeep Debnath <rtnpro@gmail.com>)
deployment #1 waiting on image or update
Errors:
* build/foo-1 has failed.
try: Inspect the build failure with 'oc logs -f bc/foo'
Warnings:
* pod/foo-1-build has no liveness probe to verify pods are still running.
try: oc set probe pod/foo-1-build --liveness ...
* The image trigger for dc/foo will have no effect until istag/foo:latest is imported or created by a build.
* dc/foo has no readiness probe to verify pods are ready to accept traffic or ensure deployment is successful.
try: oc set probe dc/foo --readiness ...
* dc/foo has no liveness probe to verify pods are still running.
try: oc set probe dc/foo --liveness ...
View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.and build container failed saying $ oc logs foo-1-build
Cloning "https://github.com/rtnpro/kompose" ...
Commit: 8ed07fca52fee936c6ef6d3117aac661bfd085ab (Fixed typos in openshift buildconfig.)
Author: Ratnadeep Debnath <rtnpro@gmail.com>
Date: Wed Dec 28 16:58:52 2016 +0530
Step 1 : FROM busybox
---> 1efc1d465fd6
<snip>
Removing intermediate container 1fb8d9987023
Successfully built 4e0fdc19432e
Pushing image 172.30.240.241:5000/simple/foo:latest ...
error: build error: Failed to push image: unauthorized: authentication required |
- spelling mistake - pass compose file dir instead of compose file to initBuildConfig call - Use as default value for cli --build-branch option - Pass current build branch to buildconfig related functions instead of opt.BuildBranch - Fix printing buildconfig source branch in logs.
- Added buildconfig doc in user guide. - Add inline code documentation to explain why buildconfig object needs to be created after imagestream, because of openshift/origin#4518
surajssd
added
the
lgtm
This implements support for generating buildconfig for services on Openshift.