[damned-lies/oscp] Split cron jobs from templates and make them resources definitions instead



commit 19627579b2f89d68f97f5d30e6d45eacc35eabcf
Author: Andrea Veri <averi redhat com>
Date:   Wed Sep 11 20:27:26 2019 +0200

    Split cron jobs from templates and make them resources definitions instead

 resources/dl-run-maintenance.yaml |  64 +++++++++++++++++++
 resources/dl-update-stats.yaml    |  65 +++++++++++++++++++
 templates/oscp.yaml               | 130 --------------------------------------
 3 files changed, 129 insertions(+), 130 deletions(-)
---
diff --git a/resources/dl-run-maintenance.yaml b/resources/dl-run-maintenance.yaml
new file mode 100644
index 00000000..1c6e1593
--- /dev/null
+++ b/resources/dl-run-maintenance.yaml
@@ -0,0 +1,64 @@
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: damned-lies-run-maintenance
+  labels:
+    app: damned-lies
+spec:
+  schedule: "10 3 * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: dl-run-maintenance
+            image: docker-registry.default.svc:5000/damned-lies/damned-lies
+            args:
+            - /l10n/venv/bin/python
+            - /l10n/damnedlies/manage.py
+            - run-maintenance
+            volumeMounts:
+            - mountPath: /var/www/djamnedlies/data
+              name: damnedlies-data
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: databasename
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-password
+            - name: SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: secret-key
+            - name: SENTRY_DSN
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: sentry-dsn
+            - name: GITLAB_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: gitlab-token
+          restartPolicy: Never
+          volumes:
+          - name: damnedlies-data
+            persistentVolumeClaim:
+              claimName: damnedlies-data-claim
diff --git a/resources/dl-update-stats.yaml b/resources/dl-update-stats.yaml
new file mode 100644
index 00000000..284cd9ee
--- /dev/null
+++ b/resources/dl-update-stats.yaml
@@ -0,0 +1,65 @@
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: damned-lies-update-stats
+  labels:
+    app: damned-lies
+spec:
+  schedule: "24 3,15 * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: dl-update-stats
+            image: docker-registry.default.svc:5000/damned-lies/damned-lies
+            args:
+            - /l10n/venv/bin/python
+            - /l10n/damnedlies/manage.py
+            - update-stats
+            - --non-gnome
+            volumeMounts:
+            - mountPath: /var/www/djamnedlies/data
+              name: damnedlies-data
+            env:
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: databasename
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-user
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-host
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: database-password
+            - name: SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: secret-key
+            - name: SENTRY_DSN
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: sentry-dsn
+            - name: GITLAB_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: damnedlies
+                  key: gitlab-token
+          restartPolicy: Never
+          volumes:
+          - name: damnedlies-data
+            persistentVolumeClaim:
+              claimName: damnedlies-data-claim
diff --git a/templates/oscp.yaml b/templates/oscp.yaml
index 526f09d3..bf453aaf 100644
--- a/templates/oscp.yaml
+++ b/templates/oscp.yaml
@@ -277,133 +277,3 @@ objects:
     tls:
       termination: edge
       insecureEdgeTerminationPolicy: "Redirect"
-
-- kind: CronJob
-  apiVersion: batch/v1beta1
-  metadata:
-    name: damnedlies-update-stats
-    labels:
-      app: damnedlies
-  spec:
-    schedule: "24 3,15 * * *"
-    concurrencyPolicy: Forbid
-    jobTemplate:
-      spec:
-        template:
-          spec:
-            containers:
-            - name: update-stats
-              image: ${IS_NAME}:${IS_VERSION}
-              args:
-              - /l10n/venv/bin/python
-              - /l10n/damnedlies/manage.py
-              - update-stats
-              - --non-gnome
-              volumeMounts:
-              - mountPath: /var/www/djamnedlies/data
-                name: damnedlies-data
-              env:
-              - name: DB_NAME
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: databasename
-              - name: DB_USER
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-user
-              - name: DB_HOST
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-host
-              - name: DB_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-password
-              - name: SECRET_KEY
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: secret-key
-              - name: SENTRY_DSN
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: sentry-dsn
-              - name: GITLAB_TOKEN
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: gitlab-token
-            volumes:
-            - name: damnedlies-data
-              persistentVolumeClaim:
-                claimName: damnedlies-data-claim
-
-
-- kind: CronJob
-  apiVersion: batch/v1beta1
-  metadata:
-    name: damnedlies-run-maintenance
-    labels:
-      app: damnedlies
-  spec:
-    schedule: "10 3 * * *"
-    concurrencyPolicy: Forbid
-    jobTemplate:
-      spec:
-        template:
-          spec:
-            containers:
-            - name: run-maintenance
-              image: ${IS_NAME}:${IS_VERSION}
-              args:
-              - /l10n/venv/bin/python
-              - /l10n/damnedlies/manage.py
-              - run-maintenance
-              volumeMounts:
-              - mountPath: /var/www/djamnedlies/data
-                name: damnedlies-data
-              env:
-              - name: DB_NAME
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: databasename
-              - name: DB_USER
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-user
-              - name: DB_HOST
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-host
-              - name: DB_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: database-password
-              - name: SECRET_KEY
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: secret-key
-              - name: SENTRY_DSN
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: sentry-dsn
-              - name: GITLAB_TOKEN
-                valueFrom:
-                  secretKeyRef:
-                    name: damnedlies
-                    key: gitlab-token
-            volumes:
-            - name: damnedlies-data
-              persistentVolumeClaim:
-                claimName: damnedlies-data-claim


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