Reorg: grep

Author: ranguard

apps/grep/hz/kustomization.yaml apps/grep/argo/kustomization.yamlapps/grep/hz/kustomization.yaml renamed to apps/grep/argo/kustomization.yaml

@@ -4,4 +4,4 @@ kind: Kustomization
 resources:
   - ./project.yaml
   - ./prod_application.yaml
-  - ../environments/prod/
+

apps/grep/hz/prod_application.yaml apps/grep/argo/prod_application.yamlapps/grep/hz/prod_application.yaml renamed to apps/grep/argo/prod_application.yaml

@@ -7,7 +7,7 @@ spec:
   project: grep
   source:
     repoURL: https://github.com/metacpan/metacpan-k8s
-    targetRevision: main
+    targetRevision: digitalocean-main
     path: apps/grep/environments/prod
   destination:
     server: https://kubernetes.default.svc

apps/grep/hz/project.yaml apps/grep/argo/project.yamlapps/grep/hz/project.yaml renamed to apps/grep/argo/project.yaml

@@ -3,7 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: grep
-  namespace: apps--grep
 data:
-  siteport: "5005"
-  plackupserverargs: "-E production-docker"
+  GREP_SITE_PORT: "5005"
+  GREP_PLACKUP_SERVER_ARGS: "-E production-docker"

apps/grep/base/configmap.yaml

@@ -3,7 +3,6 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: repo-refresh
-  namespace: apps--grep
 spec:
   schedule: "0 * * * *"
   concurrencyPolicy: Forbid
@@ -17,10 +16,15 @@ spec:
             volumeMounts:
             - name: gitrepo
               mountPath: /shared/metacpan_git
-            command: ['sh', '-c', 'cd /shared/metacpan_git && git pull origin master']
+            command: 
+              - sh
+              - -c
+              - |-
+                [ -f /shared/metacpan_git/.init_complete ] \
+                && cd /shared/metacpan_git && git pull origin master
             imagePullPolicy: IfNotPresent
           volumes:
             - name: gitrepo
               persistentVolumeClaim:
                 claimName: gitrepo
-          restartPolicy: OnFailure
+          restartPolicy: Never

apps/grep/base/cronjob.yaml

@@ -5,7 +5,6 @@ metadata:
   name: grep
   labels:
     app: grep
-  namespace: apps--grep
 spec:
   replicas: 1
   selector:
@@ -23,32 +22,27 @@ spec:
         volumeMounts:
         - name: gitrepo
           mountPath: /shared/metacpan_git
-        command: ['sh', '-c', '[ -d /shared/metacpan_git/.git ] || git clone https://github.com/metacpan/metacpan-cpan-extracted.git /shared/metacpan_git']
+        command:
+          - sh
+          - -c
+          - |-
+            [ -d /shared/metacpan_git/.git ] \
+            || git clone https://github.com/metacpan/metacpan-cpan-extracted.git /shared/metacpan_git \
+              && touch /shared/metacpan_git/.init_complete 
       containers:
       - name: web
         image: metacpan/metacpan-grep-front-end:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 3000
-        env:
-        - name: GREP_SITE_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: grep
-              key: siteport
-        - name: GREP_PLACKUP_SERVER_ARGS
-          valueFrom:
-            configMapKeyRef:
-              name: grep
-              key: plackupserverargs
+        envFrom:
+        - configMapRef:
+            name: grep
         volumeMounts:
         - name: gitrepo
           mountPath: /shared/metacpan_git
           readOnly: true
       volumes:
-        - name: config
-          configMap:
-            name: grep
         - name: gitrepo
           persistentVolumeClaim:
             claimName: gitrepo

apps/grep/base/deployment.yaml

@@ -5,7 +5,5 @@ resources:
   - ./configmap.yaml
   - ./cronjob.yaml
   - ./deployment.yaml
-  - ./ingress.yaml
-  - ./namespace.yaml
   - ./pvc.yaml
   - ./service.yaml

apps/grep/base/kustomization.yaml

@@ -2,11 +2,10 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: gitrepo
-  namespace: apps--grep
 spec:
   accessModes:
-    - ReadWriteOnce
-  storageClassName: local-path
+    - ReadWriteMany
+  storageClassName: nfs-volatile
   resources:
     requests:
-      storage: 21Gi
+      storage: 35Gi

apps/grep/base/pvc.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: grep
-  namespace: apps--grep
 spec:
   ports:
     - port: 80

apps/grep/base/service.yaml

@@ -5,15 +5,15 @@ metadata:
   namespace: apps--grep
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
-    traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
-      - grep.hz.metacpan.org
+      - grep.do.metacpan.org
       - grep.metacpan.org
       secretName: grep-tls
   rules:
-    - host: grep.hz.metacpan.org
+    - host: grep.do.metacpan.org
       http:
         paths:
           - pathType: Prefix