diff options
author | Suren A. Chilingaryan <csa@suren.me> | 2018-04-15 12:10:44 +0200 |
---|---|---|
committer | Suren A. Chilingaryan <csa@suren.me> | 2018-04-15 12:10:44 +0200 |
commit | abea46eb8a3e05f6010247b526b5364ec312f2dc (patch) | |
tree | 698b04ff13f30d5a066b46e69802913db2003e33 /setup/projects | |
parent | 110ae6da8d80b63a068f4537383e775d958cf9a9 (diff) | |
download | ands-abea46eb8a3e05f6010247b526b5364ec312f2dc.tar.gz ands-abea46eb8a3e05f6010247b526b5364ec312f2dc.tar.bz2 ands-abea46eb8a3e05f6010247b526b5364ec312f2dc.tar.xz ands-abea46eb8a3e05f6010247b526b5364ec312f2dc.zip |
Add another adei container with debugging/administrative tools to use in admin pod
Diffstat (limited to 'setup/projects')
-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 |
3 files changed, 50 insertions, 1 deletions
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" ] |