Skip to content

Allow builds to reference image repositories by name #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 18 commits into from
Jan 23, 2015
Merged

Allow builds to reference image repositories by name #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4648649
UPSTREAM: Expose validation.ValidateLabels for reuse
smarterclayton Jan 20, 2015
033bc80
UPSTREAM: Add RunUntil(stopCh) to reflector and poller to allow termi…
smarterclayton Jan 21, 2015
44dae5e
Define "to" and "dockerImageReference" as new fields on BuildOutput
smarterclayton Jan 20, 2015
7d705af
When creating build, lookup "to" field if specified
smarterclayton Jan 20, 2015
808bae1
Review comments
smarterclayton Jan 20, 2015
54d5da5
Check for an ImageRepositoryMapping with metadata/name before DIR
smarterclayton Jan 22, 2015
c4fe361
Use Status.DockerImageRepository from CLI
smarterclayton Jan 22, 2015
e5b90d9
Support service variable substitution in docker registry variable
smarterclayton Jan 21, 2015
665fa8e
Add "from" object reference to both ImageChangeTriggers
smarterclayton Jan 21, 2015
3218b81
Cleanup integration tests
smarterclayton Jan 21, 2015
132c5b7
Return the most recently updated deployment config after PUT
smarterclayton Jan 21, 2015
63abc80
Allow more goroutines to exit during test cases with RunUntil
smarterclayton Jan 21, 2015
9a204c1
Remove the need to load deployments from config_generator
smarterclayton Jan 21, 2015
366baa8
More flexibility to test-cmd and test-end-to-end
smarterclayton Jan 22, 2015
5193072
WIP - Template updates
smarterclayton Jan 22, 2015
991da56
Crash on Panic when ENV var set
smarterclayton Jan 23, 2015
4b20790
Disable race detection on test-integration because of #731
smarterclayton Jan 23, 2015
b176c34
Review comments 2 - Pass Codec through and return error on setBuildEnv
smarterclayton Jan 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ..._workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation/validation.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 16 additions & 8 deletions Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache/poller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions ...ps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache/reflector.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,11 @@ clean:
rm -rf $(OUT_DIR) $(OUT_PKG_DIR)
.PHONY: clean

# Build an official release of OpenShift, including the official images.
#
# Example:
# make clean
release: clean
hack/build-release.sh
hack/build-images.sh
.PHONY: release
3 changes: 3 additions & 0 deletions cmd/openshift/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import (
"path/filepath"

"github.com/openshift/origin/pkg/cmd/openshift"
"github.com/openshift/origin/pkg/cmd/util/serviceability"
)

func main() {
serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))

basename := filepath.Base(os.Args[0])
command := openshift.CommandFor(basename)
if err := command.Execute(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion examples/jenkins/jenkins-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
{
"metadata": {
"id":"jenkins"
"name":"jenkins"
},
"kind":"DeploymentConfig",
"apiVersion":"v1beta1",
Expand Down
23 changes: 13 additions & 10 deletions examples/sample-app/application-template-custombuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"metadata":{
"name": "ruby-helloworld-sample",
},
},
"kind": "Template",
"apiVersion": "v1beta1",
"description": "This example shows how to create a simple ruby application in openshift origin v3",
Expand Down Expand Up @@ -44,10 +44,9 @@
{
"metadata":{
"name": "origin-ruby-sample",
},
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/custom/origin-ruby-sample",
"labels": {
"name": "origin-ruby-sample"
}
Expand All @@ -58,7 +57,6 @@
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/openshift/origin-custom-docker-builder",
"labels": {
"name": "custom-docker-builder"
}
Expand All @@ -85,8 +83,10 @@
{
"type": "imageChange",
"imageChange": {
"image": "172.30.17.3:5001/openshift/origin-custom-docker-builder",
"imageRepositoryRef": { "name": "origin-custom-docker-builder"},
"image": "openshift/origin-custom-docker-builder",
"from": {
"name": "origin-custom-docker-builder"
},
"tag":"latest"
}
}
Expand All @@ -107,8 +107,9 @@
}
},
"output": {
"imageTag": "custom/origin-ruby-sample:latest",
"registry": "172.30.17.3:5001"
"to": {
"name": "origin-ruby-sample"
}
},
},
"labels": {
Expand All @@ -129,7 +130,9 @@
"containerNames": [
"ruby-helloworld"
],
"repositoryName": "172.30.17.3:5001/custom/origin-ruby-sample",
"from": {
"name": "origin-ruby-sample"
},
"tag": "latest"
}
}
Expand All @@ -150,7 +153,7 @@
"containers": [
{
"name": "ruby-helloworld",
"image": "172.30.17.3:5001/custom/origin-ruby-sample",
"image": "origin-ruby-sample",
"env": [
{
"name": "ADMIN_USERNAME",
Expand Down
23 changes: 13 additions & 10 deletions examples/sample-app/application-template-dockerbuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"metadata":{
"name": "ruby-helloworld-sample",
},
},
"kind": "Template",
"apiVersion": "v1beta1",
"description": "This example shows how to create a simple ruby application in openshift origin v3",
Expand Down Expand Up @@ -44,10 +44,9 @@
{
"metadata":{
"name": "origin-ruby-sample",
},
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/docker/origin-ruby-sample",
"labels": {
"name": "origin-ruby-sample"
}
Expand All @@ -58,7 +57,6 @@
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/openshift/ruby-20-centos",
"labels": {
"name": "ruby-20-centos"
}
Expand All @@ -85,8 +83,10 @@
{
"type": "imageChange",
"imageChange": {
"image": "172.30.17.3:5001/openshift/ruby-20-centos",
"imageRepositoryRef": { "name": "ruby-20-centos"},
"image": "openshift/ruby-20-centos",
"from": {
"name": "ruby-20-centos"
},
"tag":"latest"
}
}
Expand All @@ -102,8 +102,9 @@
"type": "Docker"
},
"output": {
"imageTag": "docker/origin-ruby-sample:latest",
"registry": "172.30.17.3:5001"
"to": {
"name": "origin-ruby-sample"
},
},
},
"labels": {
Expand All @@ -124,7 +125,9 @@
"containerNames": [
"ruby-helloworld"
],
"repositoryName": "172.30.17.3:5001/docker/origin-ruby-sample",
"from": {
"name": "origin-ruby-sample"
},
"tag": "latest"
}
}
Expand All @@ -145,7 +148,7 @@
"containers": [
{
"name": "ruby-helloworld",
"image": "172.30.17.3:5001/docker/origin-ruby-sample",
"image": "origin-ruby-sample",
"env": [
{
"name": "ADMIN_USERNAME",
Expand Down
17 changes: 9 additions & 8 deletions examples/sample-app/application-template-stibuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/test/origin-ruby-sample",
"labels": {
"name": "origin-ruby-sample"
}
Expand All @@ -58,7 +57,6 @@
},
"kind": "ImageRepository",
"apiVersion": "v1beta1",
"dockerImageRepository": "172.30.17.3:5001/openshift/ruby-20-centos",
"labels": {
"name": "ruby-20-centos"
}
Expand All @@ -85,8 +83,8 @@
{
"type": "imageChange",
"imageChange": {
"image": "172.30.17.3:5001/openshift/ruby-20-centos",
"imageRepositoryRef": { "name": "ruby-20-centos"},
"image": "openshift/ruby-20-centos",
"from": { "name": "ruby-20-centos"},
"tag":"latest"
}
}
Expand All @@ -106,8 +104,9 @@
}
},
"output": {
"imageTag": "test/origin-ruby-sample:latest",
"registry": "172.30.17.3:5001"
"to": {
"name": "origin-ruby-sample"
}
},
},
"labels": {
Expand All @@ -128,7 +127,9 @@
"containerNames": [
"ruby-helloworld"
],
"repositoryName": "172.30.17.3:5001/test/origin-ruby-sample",
"from": {
"name": "origin-ruby-sample"
},
"tag": "latest"
}
}
Expand All @@ -149,7 +150,7 @@
"containers": [
{
"name": "ruby-helloworld",
"image": "172.30.17.3:5001/test/origin-ruby-sample",
"image": "origin-ruby-sample",
"env": [
{
"name": "ADMIN_USERNAME",
Expand Down
1 change: 0 additions & 1 deletion examples/sample-app/docker-registry-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"creationTimestamp":null,
"id":"docker-registry",
"kind":"Service",
"portalIp": "172.30.17.3",
"port":5001,
"containerPort":5000,
"selector":{
Expand Down
Loading