Prepare second importer cronjob for production (#2194)

Increase run frequency to 3 hourly

Author: andrewpollock

deployment/clouddeploy/gke-workers/base/importer-deleter.yaml

@@ -0,0 +1,32 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: importer-deleter
+spec:
+  schedule: "* */3 * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: importer-deleter
+            image: importer
+            imagePullPolicy: Always
+            volumeMounts:
+              - mountPath: "/work"
+                name: "ssd"
+            securityContext:
+              privileged: true
+            resources:
+              requests:
+                cpu: 1
+                memory: "10G"
+              limits:
+                cpu: 1
+                memory: "11G"
+          restartPolicy: OnFailure
+          volumes:
+            - name: "ssd"
+              hostPath:
+                path: "/mnt/disks/ssd0"

deployment/clouddeploy/gke-workers/base/kustomization.yaml

@@ -2,6 +2,7 @@ resources:
 - workers.yaml
 - scaler.yaml
 - importer.yaml
+- importer-deleter.yaml
 - exporter.yaml
 - alpine-cve-convert.yaml
 - combine-to-osv.yaml

deployment/clouddeploy/gke-workers/environments/oss-vdb-test/importer-deleter.yaml

@@ -3,8 +3,6 @@ kind: CronJob
 metadata:
   name: importer-deleter
 spec:
-  schedule: "* */6 * * *"
-  concurrencyPolicy: Forbid
   jobTemplate:
     spec:
       template:
@@ -19,21 +17,3 @@ spec:
               - --delete
               - --delete_threshold_pct=20
               - --public_log_bucket=osv-test-public-import-logs
-            imagePullPolicy: Always
-            volumeMounts:
-              - mountPath: "/work"
-                name: "ssd"
-            securityContext:
-              privileged: true
-            resources:
-              requests:
-                cpu: 1
-                memory: "10G"
-              limits:
-                cpu: 1
-                memory: "11G"
-          restartPolicy: OnFailure
-          volumes:
-            - name: "ssd"
-              hostPath:
-                path: "/mnt/disks/ssd0"

deployment/clouddeploy/gke-workers/environments/oss-vdb-test/kustomization.yaml

@@ -1,11 +1,11 @@
 resources:
 - ../../base
 - debian-cve-convert.yaml
-- importer-deleter.yaml
 patches:
 - path: workers.yaml
 - path: scaler.yaml
 - path: importer.yaml
+- path: importer-deleter.yaml
 - path: exporter.yaml
 - path: alpine-cve-convert.yaml
 - path: combine-to-osv.yaml

deployment/clouddeploy/gke-workers/environments/oss-vdb/importer-deleter.yaml

@@ -0,0 +1,20 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: importer-deleter
+spec:
+  suspend: true
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: importer-deleter
+            env:
+            - name: GOOGLE_CLOUD_PROJECT
+              value: oss-vdb
+            image: importer
+            args:
+              - --delete
+              - --delete_threshold_pct=20
+              - --public_log_bucket=osv-public-import-logs

deployment/clouddeploy/gke-workers/environments/oss-vdb/kustomization.yaml

@@ -5,6 +5,7 @@ resources:
 patches:
 - path: workers.yaml
 - path: importer.yaml
+- path: importer-deleter.yaml
 - path: exporter.yaml
 - path: alpine-cve-convert.yaml
 - path: combine-to-osv.yaml