diff options
| -rw-r--r-- | docs/consistency.txt | 7 | ||||
| -rw-r--r-- | setup/projects/adei/templates/10-adei-debug-build.yml.j2 | 48 | ||||
| -rw-r--r-- | setup/projects/adei/templates/60-adei.yml.j2 | 2 | ||||
| -rw-r--r-- | setup/projects/adei/vars/globals.yml | 1 |
4 files changed, 56 insertions, 2 deletions
diff --git a/docs/consistency.txt b/docs/consistency.txt index 090f0a3..1b7a600 100644 --- a/docs/consistency.txt +++ b/docs/consistency.txt @@ -40,4 +40,9 @@ Networking - Ensure, we don't have override of cluster_name to first master (which we do during the provisioning of OpenShift plays) -
\ No newline at end of file + +ADEI +==== + - No caching pods are hung (for whatever reason) + +
\ No newline at end of file diff --git a/setup/projects/adei/templates/10-adei-debug-build.yml.j2 b/setup/projects/adei/templates/10-adei-debug-build.yml.j2 new file mode 100644 index 0000000..322b17e --- /dev/null +++ b/setup/projects/adei/templates/10-adei-debug-build.yml.j2 @@ -0,0 +1,48 @@ +apiVersion: v1 +kind: Template +metadata: + name: adei-debug-build + labels: + app: adei + annotations: + descriptions: "ADEI/Debug Build" +objects: + - kind: ImageStream + apiVersion: v1 + metadata: + name: adei-debug + - kind: "BuildConfig" + apiVersion: "v1" + metadata: + name: "adei-debug" + spec: +# runPolicy: "Serial" + successfulBuildsHistoryLimit: "{{ adei_pod_history_limit }}" + failedBuildsHistoryLimit: "{{ adei_pod_history_limit }}" + triggers: + - type: "ConfigChange" + - type: "ImageChange" + imageChange: {} + source: + type: "Git" + git: + uri: "http://adei.info/git/csa/devops/docker/adei.git" + contextDir: "adei-debug" + strategy: + dockerStrategy: + dockerfilePath: Dockerfile + from: + kind: "ImageStreamTag" + name: "adei:latest" + output: + to: + kind: "ImageStreamTag" + name: "adei-debug:latest" + imageLabels: + - name: "vendor" + value: "KIT" + - name: "author" + value: "Suren A. Chilingaryan" + - name: "authoritative-source-url" + value: "adei.info" + diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2 index c7c53f9..87f734d 100644 --- a/setup/projects/adei/templates/60-adei.yml.j2 +++ b/setup/projects/adei/templates/60-adei.yml.j2 @@ -114,7 +114,7 @@ objects: automatic: true from: kind: "ImageStreamTag" - name: "adei:latest" + name: "{{ cfg.image | default('adei:latest') }}" containerNames: - "{{ cfg.name }}" template: diff --git a/setup/projects/adei/vars/globals.yml b/setup/projects/adei/vars/globals.yml index c890796..3da00c6 100644 --- a/setup/projects/adei/vars/globals.yml +++ b/setup/projects/adei/vars/globals.yml @@ -294,6 +294,7 @@ adei_frontends: enabled: true admin: name: "adei-${setup}-admin" + image: "adei-debug:latest" type: admin replicas: 0 cmd: [ "/docker-entrypoint.sh", "/adei/src/scripts/system/adminer.sh" ] |