From 93c950b8e2f06a62bb4b7b0f463eec125118aafc Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Sun, 25 Feb 2018 06:02:41 +0100 Subject: ADEI metadata --- setup/projects/adei/templates/10-adei-build.yml.j2 | 8 ++++---- setup/projects/adei/templates/60-adei.yml.j2 | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) (limited to 'setup/projects/adei/templates') diff --git a/setup/projects/adei/templates/10-adei-build.yml.j2 b/setup/projects/adei/templates/10-adei-build.yml.j2 index f961219..8ca84d8 100644 --- a/setup/projects/adei/templates/10-adei-build.yml.j2 +++ b/setup/projects/adei/templates/10-adei-build.yml.j2 @@ -2,6 +2,8 @@ apiVersion: v1 kind: Template metadata: name: adei-build + labels: + app: adei annotations: descriptions: "ADEI Build" objects: @@ -9,16 +11,14 @@ objects: apiVersion: v1 metadata: name: adei - labels: - name: adei - kind: "BuildConfig" apiVersion: "v1" metadata: name: "adei" - labels: - name: adei spec: # runPolicy: "Serial" + successfulBuildsHistoryLimit: "{{ adei_pod_history_limit }}" + failedBuildsHistoryLimit: "{{ adei_pod_history_limit }}" triggers: - type: "ConfigChange" source: diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2 index 41840e4..1bff206 100644 --- a/setup/projects/adei/templates/60-adei.yml.j2 +++ b/setup/projects/adei/templates/60-adei.yml.j2 @@ -32,6 +32,10 @@ objects: kind: Service metadata: name: "{{ cfg.name }}" + labels: + adei-type: "{{ pod_type }}" + adei-name: "{{ name }}" + adei-setup: "${setup}" spec: selector: name: "{{ cfg.name }}" @@ -43,6 +47,10 @@ objects: kind: Route metadata: name: "{{ cfg.name }}" + labels: + adei-type: "{{ pod_type }}" + adei-name: "{{ name }}" + adei-setup: "${setup}" spec: host: "{{ cfg.node }}" to: @@ -59,11 +67,15 @@ objects: kind: CronJob metadata: name: "{{ cfg.name }}" + labels: + adei-type: "{{ pod_type }}" + adei-name: "{{ name }}" + adei-setup: "${setup}" spec: schedule: "{{ cfg.cron }}" concurrencyPolicy: "Forbid" - successfulJobsHistoryLimit: "2" - failedJobsHistoryLimit: "2" + successfulJobsHistoryLimit: "{{ adei_pod_history_limit }}" + failedJobsHistoryLimit: "{{ adei_pod_history_limit }}" jobTemplate: spec: completions: "1" @@ -78,9 +90,13 @@ objects: kind: DeploymentConfig metadata: name: "{{ cfg.name }}" + labels: + adei-type: "{{ pod_type }}" + adei-name: "{{ name }}" + adei-setup: "${setup}" spec: replicas: "{{ cfg.replicas }}" - revisionHistoryLimit: 2 + revisionHistoryLimit: "{{ adei_pod_history_limit }}" selector: name: "{{ cfg.name }}" strategy: -- cgit v1.2.3