Add import-controller automation and update image to latest version

elifesciences · Nov 15, 2024 · ea3bfc9 · ea3bfc9
1 parent e6c955b
commit ea3bfc9
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 1 deletion.
diff --git a/deployments/epp/prod/epp-kustomization.yaml b/deployments/epp/prod/epp-kustomization.yaml
@@ -25,6 +25,8 @@ spec:
       newTag: master-a93f3145-20241108.1446-approved # {"$imagepolicy": "epp--prod:epp-biorxiv-xslt-api-approved:tag"}
     - name: ghcr.io/elifesciences/enhanced-preprints-encoda
       newTag: master-c2702dd0-20241029.1831-approved # {"$imagepolicy": "epp--prod:epp-encoda-api-approved:tag"}
+    - name: ghcr.io/elifesciences/enhanced-preprints-import-controller
+      newTag: master-27bfe349-20241115.1529 # {"$imagepolicy": "epp--prod:epp-import-controller:tag"}
   postBuild:
     substitute:
       site_name: elife

diff --git a/deployments/epp/staging/epp-kustomization.yaml b/deployments/epp/staging/epp-kustomization.yaml
@@ -25,6 +25,8 @@ spec:
     newTag: master-a93f3145-20241108.1446 # {"$imagepolicy": "epp--staging:epp-biorxiv-xslt-api:tag"}
   - name: ghcr.io/elifesciences/enhanced-preprints-encoda
     newTag: master-c2702dd0-20241029.1831 # {"$imagepolicy": "epp--staging:epp-encoda-api:tag"}
+  - name: ghcr.io/elifesciences/enhanced-preprints-import-controller
+    newTag: master-27bfe349-20241115.1529 # {"$imagepolicy": "epp--staging:epp-import-controller:tag"}
   postBuild:
     substitute:
       site_name: elife

diff --git a/kustomizations/apps/epp/import/import-controller/automations/policy.yaml b/kustomizations/apps/epp/import/import-controller/automations/policy.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+kind: ImagePolicy
+metadata:
+  name: epp-import-controller
+  namespace: epp
+spec:
+  imageRepositoryRef:
+    name: epp-import-controller
+  filterTags:
+    pattern: '^master-[a-fA-F0-9]+-(?P<ts>[\d\.]+)$'
+    extract: '$ts'
+  policy:
+    numerical:
+      order: asc
diff --git a/kustomizations/apps/epp/import/import-controller/automations/repository.yaml b/kustomizations/apps/epp/import/import-controller/automations/repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: image.toolkit.fluxcd.io/v1beta2
+kind: ImageRepository
+metadata:
+  name: epp-import-controller
+  namespace: epp
+spec:
+  interval: 5m
+  image: ghcr.io/elifesciences/enhanced-preprints-import-controller
diff --git a/kustomizations/apps/epp/import/import-controller/deployment.yaml b/kustomizations/apps/epp/import/import-controller/deployment.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: epp-import-controller
-        image: ghcr.io/elifesciences/enhanced-preprints-import-controller:master-ba50c746-20241115.1451
+        image: ghcr.io/elifesciences/enhanced-preprints-import-controller:latest
         ports:
         - containerPort: 5000
         env:

diff --git a/kustomizations/apps/epp/import/import-controller/kustomization.yaml b/kustomizations/apps/epp/import/import-controller/kustomization.yaml
@@ -5,6 +5,9 @@ resources:
 - deployment.yaml
 - service.yaml
 - ingress.yaml
+- automations/repository.yaml
+- automations/policy.yaml
+- automations/approved-policy.yaml
 labels:
 - includeSelectors: true
   pairs: