Reorg: web for DO

ranguard · ranguard · commit 9b6eb5998142 · 2024-05-01T08:00:16.000+01:00
diff --git a/apps/web/README.md b/apps/web/README.md
@@ -0,0 +1 @@
+Deploy `argo` and that will then deploy the environments
diff --git a/apps/web/argo/kustomization.yaml b/apps/web/argo/kustomization.yaml
@@ -3,3 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./project.yaml
+  - ./stage_application.yaml
+  - ./prod_application.yaml
diff --git a/apps/web/argo/prod_application.yaml b/apps/web/argo/prod_application.yaml
@@ -7,7 +7,7 @@ spec:
   project: web
   source:
     repoURL: https://github.com/metacpan/metacpan-k8s
-    targetRevision: main
+    targetRevision: digitalocean-main
     path: apps/web/environments/prod
   destination:
     server: https://kubernetes.default.svc
diff --git a/apps/web/argo/project.yaml b/apps/web/argo/project.yaml
diff --git a/apps/web/argo/stage_application.yaml b/apps/web/argo/stage_application.yaml
@@ -7,7 +7,7 @@ spec:
   project: web
   source:
     repoURL: https://github.com/metacpan/metacpan-k8s
-    targetRevision: main
+    targetRevision: digitalocean-main
     path: apps/web/environments/stage
   destination:
     server: https://kubernetes.default.svc
diff --git a/apps/web/base/deployment.yaml b/apps/web/base/deployment.yaml
@@ -5,7 +5,6 @@ metadata:
   name: web
   labels:
     app: web
-  namespace: apps--web
 spec:
   replicas: 3
   selector:
diff --git a/apps/web/base/kustomization.yaml b/apps/web/base/kustomization.yaml
@@ -3,6 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./deployment.yaml
-  - ./ingress.yaml
-  - ./namespace.yaml
   - ./service.yaml
diff --git a/apps/web/base/service.yaml b/apps/web/base/service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: web
-  namespace: apps--web
 spec:
   ports:
     - port: 80
diff --git a/apps/web/environments/prod/ingress.yaml b/apps/web/environments/prod/ingress.yaml
@@ -5,14 +5,14 @@ metadata:
   namespace: apps--web
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
-    traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
-        - web.hz.metacpan.org
+        - web.do.metacpan.org
       secretName: web-tls
   rules:
-    - host: web.hz.metacpan.org
+    - host: web.do.metacpan.org
       http:
         paths:
           - pathType: Prefix
diff --git a/apps/web/environments/prod/kustomization.yaml b/apps/web/environments/prod/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: apps--web
 bases:
 - ../../base/
 images:
@@ -8,3 +9,6 @@ images:
 resources:
 - fastly-api_sealedsecret.yaml
 - purge-fastly-cache.yaml
+- prod_sealedsecret.yaml
+- namespace.yaml
+- ingress.yaml
diff --git a/apps/web/environments/prod/namespace.yaml b/apps/web/environments/prod/namespace.yaml
@@ -2,6 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    kubernetes.io/metadata.name: apps--web
   name: apps--web
diff --git a/apps/web/environments/prod/prod_sealedsecret.yaml b/apps/web/environments/prod/prod_sealedsecret.yaml
diff --git a/apps/web/environments/stage/ingress.yaml b/apps/web/environments/stage/ingress.yaml
@@ -0,0 +1,24 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: web
+  namespace: apps--web
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+spec:
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - web-stage.do.metacpan.org
+      secretName: web-tls
+  rules:
+    - host: web-stage.do.metacpan.org
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: web
+                port:
+                  number: 80
diff --git a/apps/web/environments/stage/kustomization.yaml b/apps/web/environments/stage/kustomization.yaml
@@ -1,39 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: stage--apps--web
-resources:
+bases:
 - ../../base/
+resources:
+- stage_sealedsecret.yaml
+- ingress.yaml
+- namespace.yaml
 images:
 - name: metacpan/metacpan-web
   newTag: 6796747a21beb1feeed5bb7cc8f52b581299c918
-patchesStrategicMerge:
-- |-
-  apiVersion: networking.k8s.io/v1
-  kind: Ingress
-  metadata:
-    name: web
-    namespace: apps--web
-  spec:
-    tls:
-      - hosts:
-        - web.stage.hz.metacpan.org
-        - www.stage.metacpan.org
-        - stage.metacpan.org
-        secretName: web-tls
-patches:
-- patch: |-
-    - op: replace
-      path: /spec/rules/0/host
-      value: web.stage.hz.metacpan.org
-    - op: replace
-      path: /spec/rules/1/host
-      value: www.stage.hz.metacpan.org
-    - op: replace
-      path: /spec/rules/2/host
-      value: stage.hz.metacpan.org
-  target:
-    group: networking.k8s.io
-    kind: Ingress
-    name: web
-    namespace: apps--web
-    version: v1
+
diff --git a/apps/web/environments/stage/namespace.yaml b/apps/web/environments/stage/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: stage--apps--web
diff --git a/apps/web/environments/stage/stage_sealedsecret.yaml b/apps/web/environments/stage/stage_sealedsecret.yaml
diff --git a/apps/web/hz/kustomization.yaml b/apps/web/hz/kustomization.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Deploy `argo` and that will then deploy the environments