Making all the applier stuff the same and adding in where missing (#161)

* first pass at making all the applier stuff the same and adding in applier stuff where it was missing

* update all the applier versions

* image pull policy to always

* update to use a passed in repo ref, and update to v3.11 base images

* fix session timeout in params issue

* jenkins master update to v3.11

* last bits of cleanup

* let's get double quote-y

* version to v1 not vi

build-docker-generic/requirements.yml

@@ -5,4 +5,4 @@
 - name: openshift-applier
   scm: git
   src: https://github.com/redhat-cop/openshift-applier
-  version: v2.0.4
+  version: v2.0.6

build-s2i-gows/.applier/group_vars/seed-hosts.yml

@@ -0,0 +1,37 @@
+---
+namespace: s2i-gows
+
+openshift_cluster_content:
+- object: Environment Setup
+  content:
+  - name: Create Projects
+    template: "https://raw.githubusercontent.com/redhat-cop/cluster-lifecycle/v3.9.0/files/projectrequest/template.yml"
+    action: create
+    params_from_vars:
+      NAMESPACE: "{{ namespace }}"
+      NAMESPACE_DISPLAY_NAME: "{{ namespace }}"
+    tags:
+      - project
+- object: imagestream
+  content:
+  - name: busybox
+    template: "{{ inventory_dir }}/../.openshift/templates/imagestreams/template.yml"
+    params_from_vars:
+      IS_NAME: busybox
+    namespace: "{{ namespace }}"
+  - name: golang
+    template: "{{ inventory_dir }}/../.openshift/templates/imagestreams/template.yml"
+    params_from_vars:
+      IS_NAME: golang
+      IS_TAG: 1.9.2
+    namespace: "{{ namespace }}"
+- object: deployments
+  content:
+  - name: s2i-gows
+    template: "{{ inventory_dir }}/../.openshift/templates/deployments/template.yml"
+    namespace: "{{ namespace }}"
+- object: builds
+  content:
+  - name: gows
+    template: "{{ inventory_dir }}/../.openshift/templates/builds/template.yml"
+    namespace: "{{ namespace }}"

build-s2i-gows/files/builds/template.yml → build-s2i-gows/.openshift/templates/builds/template.yml

@@ -104,7 +104,7 @@ objects:
         kind: ImageStreamTag
         name: gows:s2i
     source:
-      contextDir: s2i-gows/image
+      contextDir: build-s2i-gows
       git:
         uri: https://github.com/redhat-cop/containers-quickstarts
       type: Git
@@ -157,7 +157,7 @@ parameters:
 - description: Path within Git repository to build; empty for root of repository
   name: SITE_CONTEXT_DIR
   required: false
-  value: s2i-gows/demo
+  value: build-s2i-gows/demo
 - description: Git branch/tag reference
   name: SITE_SOURCE_REPOSITORY_REF
   value: master

build-s2i-gows/README.md

@@ -44,7 +44,7 @@ The build supports a few environment variables to specify the source of the site
 
 | Variable Name | Default Value | Description |
 | ------------- | ------------- | ----------- |
-| `SITE_CONTEXT_DIR` | `s2i-gows/demo` | Location of the site files within the git repository |
+| `SITE_CONTEXT_DIR` | `build-s2i-gows/demo` | Location of the site files within the git repository |
 | `SITE_SOURCE_REPOSITORY_REF` | `master` | Git branch/tag of the site files |
 | `SITE_SOURCE_REPOSITORY_URL` | `https://github.com/redhat-cop/containers-quickstarts` | Git repository of the site files |
 

build-s2i-gows/requirements.yml

@@ -5,4 +5,4 @@
 - name: openshift-applier
   scm: git
   src: https://github.com/redhat-cop/openshift-applier
-  version: v3.7.2
+  version: v2.0.6

build-s2i-jekyll/.applier/group_vars/seed-hosts.yml

@@ -0,0 +1,45 @@
+---
+namespace: s2i-jekyll
+
+openshift_cluster_content:
+- object: Environment Setup
+  content:
+  - name: Create Projects
+    template: "https://raw.githubusercontent.com/redhat-cop/cluster-lifecycle/v3.9.0/files/projectrequest/template.yml"
+    action: create
+    params_from_vars:
+      NAMESPACE: "{{ namespace }}"
+      NAMESPACE_DISPLAY_NAME: "{{ namespace }}"
+    tags:
+      - project
+- object: imagestream
+  content:
+  - name: ruby
+    template: "{{ inventory_dir }}/../.openshift/templates/imagestreams/template.yml"
+    params_from_vars:
+      IS_NAME: ruby
+      IS_TAG: 2.4.0-alpine
+    namespace: "{{ namespace }}"
+  - name: jekyll-builder
+    template: "{{ inventory_dir }}/../.openshift/templates/imagestreams/template.yml"
+    params_from_vars:
+      IS_NAME: jekyll-builder
+    namespace: "{{ namespace }}"
+  - name: openshift-playbooks
+    template: "{{ inventory_dir }}/../.openshift/templates/imagestreams/template.yml"
+    params_from_vars:
+      IS_NAME: openshift-playbooks
+    namespace: "{{ namespace }}"
+- object: deployments
+  content:
+  - name: s2i-jekyll
+    template: "{{ inventory_dir }}/../.openshift/templates/deployments/template.yml"
+    namespace: "{{ namespace }}"
+- object: builds
+  content:
+  - name: jekyll-builder
+    template: "{{ inventory_dir }}/../.openshift/templates/builds/docker-template.yml"
+    namespace: "{{ namespace }}"
+  - name: openshift-playbooks
+    template: "{{ inventory_dir }}/../.openshift/templates/builds/source-template.yml"
+    namespace: "{{ namespace }}"

build-s2i-jekyll/files/builds/docker-template.yml → build-s2i-jekyll/.openshift/templates/builds/docker-template.yml

@@ -45,7 +45,7 @@ parameters:
   value: jekyll-builder
 - description: Path within Git repository to build; empty for root of repository
   name: CONTEXT_DIR
-  value: s2i-jekyll
+  value: build-s2i-jekyll
 - description: Image stream tag for the image you'd like to use to build the application
   name: FROM_STREAM_TAG
   required: true

build-s2i-jekyll/requirements.yml

@@ -5,4 +5,4 @@
 - name: openshift-applier
   scm: git
   src: https://github.com/redhat-cop/openshift-applier
-  version: v3.7.2
+  version: v2.0.6

build-s2i-liberty/.applier/group_vars/seed-hosts.yml

@@ -0,0 +1,26 @@
+---
+namespace: liberty-demo
+
+openshift_cluster_content:
+- object: Environment Setup
+  content:
+  - name: Create Projects
+    template: "https://raw.githubusercontent.com/redhat-cop/cluster-lifecycle/v3.9.0/files/projectrequest/template.yml"
+    action: create
+    params_from_vars:
+      NAMESPACE: "{{ namespace }}"
+      NAMESPACE_DISPLAY_NAME: "{{ namespace }}"
+    tags:
+      - project
+- object: builds
+  content:
+  - name: "Build application"
+    namespace: liberty-demo
+    template: "{{ inventory_dir }}/../.openshift/templates/build.yml"
+    params: "{{ inventory_dir }}/../.openshift/params/build-dev"
+- object: deployments
+  content:
+  - name: "deploy dev environment"
+    namespace: liberty-demo
+    template: "{{ inventory_dir }}/../.openshift/templates/deployment.yml"
+    params: "{{ inventory_dir }}/../.openshift/params/deployment-dev"

build-s2i-liberty/applier/templates/build.yml → build-s2i-liberty/.openshift/templates/build.yml

@@ -161,7 +161,7 @@ parameters:
 - description: Path within Git repository to build; empty for root of repository
   name: LIBERTY_CONTEXT_DIR
   required: false
-  value: s2i-liberty
+  value: build-s2i-liberty
 - description: Git branch/tag reference
   name: LIBERTY_SOURCE_REPOSITORY_REF
   required: false

build-s2i-liberty/README.md

@@ -40,12 +40,12 @@ This demo should be run on an installation of OpenShift Enterprise V3.7
 ### OpenShift objects
 
 The openshift-applier will create the following OpenShift objects:
-* A project named `liberty-demo` (see [applier/projects/projects.yml](applier/projects/projects.yml))
-* Five ImageStreams named `websphere-liberty`, `s2i-liberty`, `hello-world-artifacts`, `eap70-openshift` and `hello-world` (see [applier/templates/build.yml](applier/templates/build.yml))
-* Three BuildConfigs named `websphere-liberty`, `hello-world-artifacts` and `hello-world` (see [applier/templates/build.yml](applier/templates/build.yml))
-* A DeploymentConfig named `hello-world` (see [applier/templates/deployment.ym](applier/templates/deployment.yml))
-* A Service named `hello-world` (see [applier/templates/deployment.ym](applier/templates/deployment.yml))
-* A Route named `hello-world` (see [applier/templates/deployment.ym](applier/templates/deployment.yml))
+* A project named `liberty-demo` (see [applier/projects/projects.yml](.openshift/templates/projects/projects.yml))
+* Five ImageStreams named `websphere-liberty`, `s2i-liberty`, `hello-world-artifacts`, `eap70-openshift` and `hello-world` (see [applier/templates/build.yml](.applier/templates/build.yml))
+* Three BuildConfigs named `websphere-liberty`, `hello-world-artifacts` and `hello-world` (see [applier/templates/build.yml](.applier/templates/build.yml))
+* A DeploymentConfig named `hello-world` (see [applier/templates/deployment.ym](.applier/templates/deployment.yml))
+* A Service named `hello-world` (see [applier/templates/deployment.ym](.applier/templates/deployment.yml))
+* A Route named `hello-world` (see [applier/templates/deployment.ym](.applier/templates/deployment.yml))
 
 >**NOTE:** This requires permission to create new projects and that the `liberty-demo` project doesn't already exist
 

build-s2i-liberty/requirements.yml

@@ -5,4 +5,4 @@
 - name: openshift-applier
   scm: git
   src: https://github.com/redhat-cop/openshift-applier
-  version: v3.7.2
+  version: v2.0.6

build-s2i-play/.applier/group_vars/seed-hosts.yml

@@ -0,0 +1,26 @@
+---
+namespace: play-demo
+
+openshift_cluster_content:
+- object: Environment Setup
+  content:
+  - name: Create Projects
+    template: "https://raw.githubusercontent.com/redhat-cop/cluster-lifecycle/v3.9.0/files/projectrequest/template.yml"
+    action: create
+    params_from_vars:
+      NAMESPACE: "{{ namespace }}"
+      NAMESPACE_DISPLAY_NAME: "{{ namespace }}"
+    tags:
+      - project
+- object: builds
+  content:
+  - name: build play
+    template: "{{ inventory_dir }}/../.openshift/templates/build.yml"
+    params: "{{ inventory_dir }}/../.openshift/params/build"
+    namespace: "{{ namespace }}"
+- object: deployments
+  content:
+  - name: deploy MongoDB config servers
+    template: "{{ inventory_dir }}/../.openshift/templates/deployment.yml"
+    params: "{{ inventory_dir }}/../.openshift/params/deployment"
+    namespace: "{{ namespace }}"

build-s2i-play/applier/templates/build.yml → build-s2i-play/.openshift/templates/build.yml

@@ -105,7 +105,7 @@ parameters:
   displayName: Play builder context directory.
   name: PLAY_BUILDER_CONTEXT_DIR
   required: false
-  value: s2i-play
+  value: build-s2i-play
 - description: The name for the Play Framework application.
   displayName: Play application name
   name: PLAY_APPLICATION_NAME

build-s2i-play/README.md

@@ -48,12 +48,12 @@ This demo should be run on an installation of OpenShift Enterprise V3
 ### OpenShift objects
 
 The openshift-applier will create the following OpenShift objects:
-* A project named `play-demo` (see [applier/projects/projects.yml](applier/projects/projects.yml))
-* Three ImageStreams named `rhel7`, `s2i-play` and `play-app` (see [applier/templates/build.yml](applier/templates/build.yml))
-* Two BuildConfigs named `s2i-play` and `play-app` (see [applier/templates/build.yml](applier/templates/build.yml))
-* A DeploymentConfig named `play-app` (see [applier/templates/deployment.yml](applier/templates/deployment.yml))
-* A Service named `play-app` (see [applier/templates/deployment.yml](applier/templates/deployment.yml))
-* A Route named `play-app` (see [applier/templates/deployment.yml](applier/templates/deployment.yml))
+* A project named `play-demo` (see [applier/projects/projects.yml](.applier/projects/projects.yml))
+* Three ImageStreams named `rhel7`, `s2i-play` and `play-app` (see [applier/templates/build.yml](.applier/templates/build.yml))
+* Two BuildConfigs named `s2i-play` and `play-app` (see [applier/templates/build.yml](.applier/templates/build.yml))
+* A DeploymentConfig named `play-app` (see [applier/templates/deployment.yml](.applier/templates/deployment.yml))
+* A Service named `play-app` (see [applier/templates/deployment.yml](.applier/templates/deployment.yml))
+* A Route named `play-app` (see [applier/templates/deployment.yml](.applier/templates/deployment.yml))
 
 >**NOTE:** This requires permission to create new projects and that the `play-demo` project doesn't already exist