Merge branch 'master' of https://git.cluster.fun/AverageMarcus/cluster.fun

manifests/_apps/buzzers.yaml

@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: buzzers
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: buzzers
-    name: cluster-fun (scaleway)
-  source:
-    path: manifests/buzzers
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data

manifests/buzzers/buzzers.yaml

@@ -1,65 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: buzzers
-  namespace: buzzers
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: web
-    name: web
-  selector:
-    app: buzzers
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: buzzers
-  namespace: buzzers
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: buzzers
-  template:
-    metadata:
-      labels:
-        app: buzzers
-    spec:
-      containers:
-      - name: web
-        image: docker.cluster.fun/averagemarcus/buzzers:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 80
-          name: web
-        resources:
-          limits:
-            memory: 283Mi
-          requests:
-            memory: 283Mi
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: buzzers
-  namespace: buzzers
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    traefik.ingress.kubernetes.io/frontend-entry-points: http,https
-    traefik.ingress.kubernetes.io/redirect-entry-point: https
-    traefik.ingress.kubernetes.io/redirect-permanent: "true"
-spec:
-  tls:
-  - hosts:
-    - buzzers.cluster.fun
-    secretName: buzzers-ingress
-  rules:
-  - host: buzzers.cluster.fun
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: buzzers
-          servicePort: 80

manifests/inlets/inlets.yaml

@@ -143,3 +143,27 @@ spec:
         backend:
           serviceName: inlets
           servicePort: 80
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: adguard
+  namespace: inlets
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    traefik.ingress.kubernetes.io/frontend-entry-points: http,https
+    traefik.ingress.kubernetes.io/redirect-entry-point: https
+    traefik.ingress.kubernetes.io/redirect-permanent: "true"
+spec:
+  tls:
+  - hosts:
+    - adguard.cluster.fun
+    secretName: adguard-ingress
+  rules:
+  - host: adguard.cluster.fun
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: inlets
+          servicePort: 80