From 0b0b9954c2d0602b1e9d0a387d2a195a790f8084 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Thu, 22 Mar 2018 04:37:46 +0100
Subject: Various fixes and provide ADEI admin container...
---
setup/projects/adei/templates/01-secret.yml.j2 | 2 +-
setup/projects/adei/templates/01-webdav-secret.yml.j2 | 17 +++++++++++++++++
setup/projects/adei/templates/60-adei.yml.j2 | 5 ++++-
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 setup/projects/adei/templates/01-webdav-secret.yml.j2
(limited to 'setup/projects/adei/templates')
diff --git a/setup/projects/adei/templates/01-secret.yml.j2 b/setup/projects/adei/templates/01-secret.yml.j2
index 44d5914..d792e4c 100644
--- a/setup/projects/adei/templates/01-secret.yml.j2
+++ b/setup/projects/adei/templates/01-secret.yml.j2
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Template
metadata:
- name: adei-build
+ name: adei-secret
labels:
app: adei
annotations:
diff --git a/setup/projects/adei/templates/01-webdav-secret.yml.j2 b/setup/projects/adei/templates/01-webdav-secret.yml.j2
new file mode 100644
index 0000000..f09b1ec
--- /dev/null
+++ b/setup/projects/adei/templates/01-webdav-secret.yml.j2
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Template
+metadata:
+ name: adei-webdav-secret
+ labels:
+ app: adei
+ annotations:
+ descriptions: "ADEI Repository Secrets"
+objects:
+- apiVersion: v1
+ kind: Secret
+ metadata:
+ annotations:
+ template.openshift.io/expose-repo: '{.data[''repo'']}'
+ name: webdav
+ stringData:
+ repo: "https+webdav://adei:{{ kaas_project_config.adei_password }}@darksoft.org/openshift"
diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index 7eafd33..b3e6755 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -24,7 +24,7 @@ objects:
{% set pull_policy = "Always" %}
{% set restart_policy = "Always" %}
{% else %}
-{% set pod_type = "cacher" %}
+{% set pod_type = cfg.type | default("cacher") %}
{% set pull_policy = "Always" %}
{% set restart_policy = "Always" %}
{% endif %}
@@ -247,3 +247,6 @@ parameters:
description: "Schedule of cleaning tasks"
- name: "adei_revision"
value: "last:1"
+ - name: "maintainer"
+ value: "Suren A. Chilingaryan <csa@suren.me>"
+
\ No newline at end of file
--
cgit v1.2.3