diff --git a/default/archivebox.yaml b/default/archivebox.yaml index 2a2529a..ca366a8 100644 --- a/default/archivebox.yaml +++ b/default/archivebox.yaml @@ -15,17 +15,17 @@ spec: app: sonic spec: containers: - - name: sonic - image: archivebox/sonic:latest - imagePullPolicy: Always - ports: - - containerPort: 1491 - env: - - name: SEARCH_BACKEND_PASSWORD - valueFrom: - secretKeyRef: - name: password - key: password + - name: sonic + image: archivebox/sonic:latest + imagePullPolicy: Always + ports: + - containerPort: 1491 + env: + - name: SEARCH_BACKEND_PASSWORD + valueFrom: + secretKeyRef: + name: password + key: password --- apiVersion: apps/v1 kind: Deployment @@ -43,43 +43,43 @@ spec: app: archivebox spec: containers: - - name: archivebox - image: archivebox/archivebox:latest - imagePullPolicy: Always - ports: - - containerPort: 8000 - env: - - name: SONIC_HOST - value: "sonic.default.svc.cluster.local" - - name: SONIC_PORT - value: "1491" - - name: SEARCH_BACKEND_ENGINE - value: "sonic" - - name: SONIC_PASSWORD - valueFrom: - secretKeyRef: - name: password - key: password - - name: ADMIN_USERNAME - value: "ivanch" - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: password - key: password - - name: CSRF_TRUSTED_ORIGINS - value: "archive.haven" - - name: ALLOWED_HOSTS - value: "*" - - name: PUBLIC_ADD_VIEW - value: "false" - volumeMounts: - - name: archivebox-data - mountPath: /data + - name: archivebox + image: archivebox/archivebox:latest + imagePullPolicy: Always + ports: + - containerPort: 8000 + env: + - name: SONIC_HOST + value: "sonic.default.svc.cluster.local" + - name: SONIC_PORT + value: "1491" + - name: SEARCH_BACKEND_ENGINE + value: "sonic" + - name: SONIC_PASSWORD + valueFrom: + secretKeyRef: + name: password + key: password + - name: ADMIN_USERNAME + value: "ivanch" + - name: ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: password + key: password + - name: CSRF_TRUSTED_ORIGINS + value: "archive.haven" + - name: ALLOWED_HOSTS + value: "*" + - name: PUBLIC_ADD_VIEW + value: "false" + volumeMounts: + - name: archivebox-data + mountPath: /data volumes: - - name: archivebox-data - persistentVolumeClaim: - claimName: archivebox-data + - name: archivebox-data + persistentVolumeClaim: + claimName: archivebox-data --- apiVersion: v1 kind: Service @@ -90,9 +90,9 @@ spec: selector: app: sonic ports: - - protocol: TCP - port: 1491 - targetPort: 1491 + - protocol: TCP + port: 1491 + targetPort: 1491 --- apiVersion: v1 kind: Service @@ -103,9 +103,9 @@ spec: selector: app: archivebox ports: - - protocol: TCP - port: 8000 - targetPort: 8000 + - protocol: TCP + port: 8000 + targetPort: 8000 --- # 3) PersistentVolumeClaim apiVersion: v1 @@ -133,13 +133,13 @@ metadata: spec: ingressClassName: nginx rules: - - host: "archive.haven" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: archivebox-svc - port: - number: 8000 \ No newline at end of file + - host: "archive.haven" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: archivebox-svc + port: + number: 8000 diff --git a/default/notepad.yaml b/default/notepad.yaml index 37eafb1..9eecd3f 100644 --- a/default/notepad.yaml +++ b/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: / @@ -88,4 +95,4 @@ spec: service: name: notepad port: - number: 80 \ No newline at end of file + number: 80 diff --git a/dns/adguard-sync.yaml b/dns/adguard-sync.yaml index 4dd1c75..01da142 100644 --- a/dns/adguard-sync.yaml +++ b/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 diff --git a/infra/code-config.yaml b/infra/code-config.yaml index 252a4ee..945b48a 100644 --- a/infra/code-config.yaml +++ b/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 @@ -100,4 +110,4 @@ spec: service: name: code-config port: - number: 8443 \ No newline at end of file + number: 8443