moving things around

default/archivebox.yaml

@@ -15,17 +15,17 @@ spec:
         app: sonic
     spec:
       containers:
-      - name: sonic
+        - name: sonic
-        image: archivebox/sonic:latest
+          image: archivebox/sonic:latest
-        imagePullPolicy: Always
+          imagePullPolicy: Always
-        ports:
+          ports:
-        - containerPort: 1491
+            - containerPort: 1491
-        env:
+          env:
-        - name: SEARCH_BACKEND_PASSWORD
+            - name: SEARCH_BACKEND_PASSWORD
-          valueFrom:
+              valueFrom:
-            secretKeyRef:
+                secretKeyRef:
-              name: password
+                  name: password
-              key: password
+                  key: password
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -43,43 +43,43 @@ spec:
         app: archivebox
     spec:
       containers:
-      - name: archivebox
+        - name: archivebox
-        image: archivebox/archivebox:latest
+          image: archivebox/archivebox:latest
-        imagePullPolicy: Always
+          imagePullPolicy: Always
-        ports:
+          ports:
-        - containerPort: 8000
+            - containerPort: 8000
-        env:
+          env:
-        - name: SONIC_HOST
+            - name: SONIC_HOST
-          value: "sonic.default.svc.cluster.local"
+              value: "sonic.default.svc.cluster.local"
-        - name: SONIC_PORT
+            - name: SONIC_PORT
-          value: "1491"
+              value: "1491"
-        - name: SEARCH_BACKEND_ENGINE
+            - name: SEARCH_BACKEND_ENGINE
-          value: "sonic"
+              value: "sonic"
-        - name: SONIC_PASSWORD
+            - name: SONIC_PASSWORD
-          valueFrom:
+              valueFrom:
-            secretKeyRef:
+                secretKeyRef:
-              name: password
+                  name: password
-              key: password
+                  key: password
-        - name: ADMIN_USERNAME
+            - name: ADMIN_USERNAME
-          value: "ivanch"
+              value: "ivanch"
-        - name: ADMIN_PASSWORD
+            - name: ADMIN_PASSWORD
-          valueFrom:
+              valueFrom:
-            secretKeyRef:
+                secretKeyRef:
-              name: password
+                  name: password
-              key: password
+                  key: password
-        - name: CSRF_TRUSTED_ORIGINS
+            - name: CSRF_TRUSTED_ORIGINS
-          value: "archive.haven"
+              value: "archive.haven"
-        - name: ALLOWED_HOSTS
+            - name: ALLOWED_HOSTS
-          value: "*"
+              value: "*"
-        - name: PUBLIC_ADD_VIEW
+            - name: PUBLIC_ADD_VIEW
-          value: "false"
+              value: "false"
-        volumeMounts:
+          volumeMounts:
-        - name: archivebox-data
+            - name: archivebox-data
-          mountPath: /data
+              mountPath: /data
       volumes:
-      - name: archivebox-data
+        - name: archivebox-data
-        persistentVolumeClaim:
+          persistentVolumeClaim:
-          claimName: archivebox-data
+            claimName: archivebox-data
 ---
 apiVersion: v1
 kind: Service
@@ -90,9 +90,9 @@ spec:
   selector:
     app: sonic
   ports:
-  - protocol: TCP
+    - protocol: TCP
-    port: 1491
+      port: 1491
-    targetPort: 1491
+      targetPort: 1491
 ---
 apiVersion: v1
 kind: Service
@@ -103,9 +103,9 @@ spec:
   selector:
     app: archivebox
   ports:
-  - protocol: TCP
+    - protocol: TCP
-    port: 8000
+      port: 8000
-    targetPort: 8000
+      targetPort: 8000
 ---
 # 3) PersistentVolumeClaim
 apiVersion: v1
@@ -133,13 +133,13 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: "archive.haven"
+    - host: "archive.haven"
-    http:
+      http:
-      paths:
+        paths:
-      - path: /
+          - path: /
-        pathType: Prefix
+            pathType: Prefix
-        backend:
+            backend:
-          service:
+              service:
-            name: archivebox-svc
+                name: archivebox-svc
-            port:
+                port:
-              number: 8000
+                  number: 8000

default/notepad.yaml

@@ -31,6 +31,13 @@ spec:
               exec docker-php-entrypoint apache2-foreground
           ports:
             - containerPort: 80
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
           volumeMounts:
             - name: notepad-data
               mountPath: /var/www/html/_tmp
@@ -79,7 +86,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: notepad.lab
+    - host: notepad.haven
       http:
         paths:
           - path: /

dns/adguard-sync.yaml

@@ -40,7 +40,7 @@ spec:
           name: web-port
         env:
         - name: CRON
-          value: "*/2 * * * *"
+          value: "0 * * * *"
         - name: RUN_ON_START
           value: "true"
         - name: LOG_LEVEL

infra/code-config.yaml

@@ -15,6 +15,16 @@ spec:
       labels:
         app: code-config
     spec:
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              preference:
+                matchExpressions:
+                  - key: kubernetes.io/hostname
+                    operator: In
+                    values:
+                      - iris
       containers:
         - name: code-config
           image: lscr.io/linuxserver/code-server:latest