Skip to content

Commit

Permalink
Use per app build namespace(s)
Browse files Browse the repository at this point in the history
  • Loading branch information
pabrahamsson committed Dec 6, 2017
1 parent a66d8bf commit ef520de
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion basic-tomcat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ https://github.com/etsauer/ticket-monster

For the purposes of this demo, we are going to create three stages for our application to be promoted through.

- `build`
- `basic-tomcat-build`
- `basic-tomcat-dev`
- `basic-tomcat-stage`
- `basic-tomcat-prod`
Expand Down
2 changes: 1 addition & 1 deletion basic-tomcat/files/builds/params
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NAMESPACE=build
NAMESPACE=basic-tomcat-build
SOURCE_REPOSITORY_URL=https://github.com/pabrahamsson/ticket-monster.git
SOURCE_REPOSITORY_REF=build
2 changes: 1 addition & 1 deletion basic-tomcat/files/deployment/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ parameters:
- description: Namespace of service account that can deploy to this project
name: SA_NAMESPACE
required: true
value: build
value: basic-tomcat-build
- description: 'Custom hostname for http service route. Leave blank for default hostname,
e.g.: <application-name>-<project>.<default-domain-suffix>'
name: HOSTNAME_HTTP
Expand Down
2 changes: 1 addition & 1 deletion basic-tomcat/files/projects/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ items:
- kind: ProjectRequest
apiVersion: v1
metadata:
name: build
name: basic-tomcat-build
creationTimestam: null
displayName: Build - Jenkins is here
2 changes: 1 addition & 1 deletion basic-tomcat/inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ openshift_cluster_content:
- object: deployments
content:
- name: jenkins
namespace: build
namespace: basic-tomcat-build
template: openshift//jenkins-ephemeral
params: "{{ inventory_dir }}/../files/deployment/build/params"
- name: basic-tomcat-dev
Expand Down
2 changes: 1 addition & 1 deletion blue-green-spring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ https://github.com/malacourse/simple-spring-boot-web

For the purposes of this demo, we are going to create four stages for our application to be promoted through.

- 'build'
- 'spring-boot-web-build'
- `spring-boot-web-dev`
- `spring-boot-web-stage`
- `spring-boot-web-prod`
Expand Down
2 changes: 1 addition & 1 deletion blue-green-spring/files/builds/params
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APPLICATION_NAME=spring-boot-web
NAMESPACE=build
NAMESPACE=spring-boot-web-build
IMAGE_STREAM_TAG_NAME=redhat-openjdk18-openshift:1.1
SOURCE_REPOSITORY_URL=https://github.com/pabrahamsson/simple-spring-boot-web.git
SOURCE_REPOSITORY_REF=build
2 changes: 1 addition & 1 deletion blue-green-spring/files/deployment/template-bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ parameters:
- description: Namespace of service account that can deploy to this project
name: SA_NAMESPACE
required: true
value: build
value: spring-boot-web-build
- description: 'Custom hostname for http service route. Leave blank for default hostname,
e.g.: <application-name>-<project>.<default-domain-suffix>'
name: HOSTNAME_HTTP
2 changes: 1 addition & 1 deletion blue-green-spring/files/deployment/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ parameters:
- description: Namespace of service account that can deploy to this project
name: SA_NAMESPACE
required: true
value: build
value: spring-boot-web-build
- description: 'Custom hostname for http service route. Leave blank for default hostname,
e.g.: <application-name>-<project>.<default-domain-suffix>'
name: HOSTNAME_HTTP
2 changes: 1 addition & 1 deletion blue-green-spring/files/projects/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ items:
- kind: ProjectRequest
apiVersion: v1
metadata:
name: build
name: spring-boot-web-build
creationTimestam: null
displayName: Build - Jenkins is here
2 changes: 1 addition & 1 deletion blue-green-spring/inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ openshift_cluster_content:
- object: deployments
content:
- name: jenkins
namespace: build
namespace: spring-boot-web-build
template: openshift//jenkins-ephemeral
params: "{{ inventory_dir }}/../files/deployment/build/params"
- name: basic-tomcat-dev
Expand Down

0 comments on commit ef520de

Please sign in to comment.