[download-web] Land env vars and sed replacements for /etc/mirrorbrain.conf



commit 886a1fff8dfdc4aa0c9c091ce17f97c86fafb8e0
Author: Andrea Veri <averi redhat com>
Date:   Mon Nov 11 14:33:05 2019 +0100

    Land env vars and sed replacements for /etc/mirrorbrain.conf

 templates/create-hashes-cron.yaml | 27 ++++++++++++++++++++++++++-
 templates/db-vacuum-cron.yaml     | 27 ++++++++++++++++++++++++++-
 templates/mirrorprobe-cron.yaml   | 29 +++++++++++++++++++++++++++--
 templates/mirrors-scan-cron.yaml  | 27 ++++++++++++++++++++++++++-
 4 files changed, 105 insertions(+), 5 deletions(-)
---
diff --git a/templates/create-hashes-cron.yaml b/templates/create-hashes-cron.yaml
index 394a61c..ee4fc66 100644
--- a/templates/create-hashes-cron.yaml
+++ b/templates/create-hashes-cron.yaml
@@ -18,7 +18,32 @@ spec:
             image: "docker-registry.default.svc:5000/download-web/download-web"
             command: ["/bin/sh", "-c"]
             args:
-            - /usr/bin/mb makehashes /download/data/pub/GNOME/ -t /download/hashes
+            - sed -i "s/DB_HOST/$DB_HOST/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_NAME/$DB_NAME/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_USER/$DB_USER/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /download/mirrorbrain.conf;
+              /usr/bin/mb makehashes /download/data/pub/GNOME/ -t /download/hashes
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-name
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-password
             imagePullPolicy: Always
             volumeMounts:
             - mountPath: /download/hashes
diff --git a/templates/db-vacuum-cron.yaml b/templates/db-vacuum-cron.yaml
index 0f5d775..8498627 100644
--- a/templates/db-vacuum-cron.yaml
+++ b/templates/db-vacuum-cron.yaml
@@ -18,7 +18,32 @@ spec:
             image: "docker-registry.default.svc:5000/download-web/download-web"
             command: ["/bin/sh", "-c"]
             args:
-            - /usr/bin/mb db vacuum
+            - sed -i "s/DB_HOST/$DB_HOST/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_NAME/$DB_NAME/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_USER/$DB_USER/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /download/mirrorbrain.conf;
+              /usr/bin/mb db vacuum
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-name
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-password
             imagePullPolicy: Always
           dnsPolicy: ClusterFirst
           restartPolicy: Never
diff --git a/templates/mirrorprobe-cron.yaml b/templates/mirrorprobe-cron.yaml
index 1440478..270c171 100644
--- a/templates/mirrorprobe-cron.yaml
+++ b/templates/mirrorprobe-cron.yaml
@@ -18,8 +18,33 @@ spec:
             image: "docker-registry.default.svc:5000/download-web/download-web"
             command: ["/bin/sh", "-c"]
             args:
-            - /usr/bin/mirrorprobe
-            imagePullPolicy: Always
+            - sed -i "s/DB_HOST/$DB_HOST/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_NAME/$DB_NAME/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_USER/$DB_USER/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /download/mirrorbrain.conf;
+              /usr/bin/mirrorprobe
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-name
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-password
+          imagePullPolicy: Always
           dnsPolicy: ClusterFirst
           restartPolicy: Never
           terminationGracePeriodSeconds: 30
diff --git a/templates/mirrors-scan-cron.yaml b/templates/mirrors-scan-cron.yaml
index 40fff0c..dc600df 100644
--- a/templates/mirrors-scan-cron.yaml
+++ b/templates/mirrors-scan-cron.yaml
@@ -18,7 +18,32 @@ spec:
             image: "docker-registry.default.svc:5000/download-web/download-web"
             command: ["/bin/sh", "-c"]
             args:
-            - /usr/bin/mb scan --quiet --jobs 4 --all
+            - sed -i "s/DB_HOST/$DB_HOST/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_NAME/$DB_NAME/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_USER/$DB_USER/g" /download/mirrorbrain.conf;
+              sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /download/mirrorbrain.conf;
+              /usr/bin/mb scan --quiet --jobs 4 --all
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-name
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: download-web
+                  key: database-password
             imagePullPolicy: Always
           dnsPolicy: ClusterFirst
           restartPolicy: Never


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]