From 0b1011d0f6402507b24ba90edb96e1bb55046437 Mon Sep 17 00:00:00 2001 From: Vegard Hagen Date: Sat, 17 Feb 2024 23:20:56 +0100 Subject: [PATCH] fix(cilium): Announce ARP on all interfaces --- apps/media/plex/deployment.yaml | 2 +- apps/media/plex/http-route.yaml | 2 +- apps/media/plex/ingress.yaml | 2 +- apps/media/plex/kustomization.yaml | 2 +- apps/media/plex/service.yaml | 7 +++++-- apps/test/cuda-test/pod.yaml | 8 ++++---- infra/argocd/kustomization.yaml | 2 +- infra/cilium/announce.yaml | 2 -- infra/cilium/ip-pool.yaml | 5 +++-- infra/cilium/values.yaml | 6 +++--- infra/net-aux/config/cloudflared/config.yaml | 8 -------- infra/net-aux/config/pi-hole/02-custom.conf | 4 ++-- infra/nvidia-device-plugin/kustomization.yaml | 18 +++++++++--------- infra/pi-hole/config/02-custom.conf | 4 ++-- 14 files changed, 33 insertions(+), 39 deletions(-) diff --git a/apps/media/plex/deployment.yaml b/apps/media/plex/deployment.yaml index 18a32db..a546f34 100644 --- a/apps/media/plex/deployment.yaml +++ b/apps/media/plex/deployment.yaml @@ -25,7 +25,7 @@ spec: - configMapRef: name: plex-env ports: - - name: web + - name: http containerPort: 32400 volumeMounts: - name: config diff --git a/apps/media/plex/http-route.yaml b/apps/media/plex/http-route.yaml index 7eb97ed..e5ac4db 100644 --- a/apps/media/plex/http-route.yaml +++ b/apps/media/plex/http-route.yaml @@ -15,4 +15,4 @@ spec: value: / backendRefs: - name: plex - port: 32400 \ No newline at end of file + port: 80 diff --git a/apps/media/plex/ingress.yaml b/apps/media/plex/ingress.yaml index 9c94006..ce5d689 100644 --- a/apps/media/plex/ingress.yaml +++ b/apps/media/plex/ingress.yaml @@ -10,4 +10,4 @@ spec: kind: Rule services: - name: plex - port: 32400 \ No newline at end of file + port: 80 \ No newline at end of file diff --git a/apps/media/plex/kustomization.yaml b/apps/media/plex/kustomization.yaml index 7bbe9e0..826c539 100644 --- a/apps/media/plex/kustomization.yaml +++ b/apps/media/plex/kustomization.yaml @@ -20,4 +20,4 @@ resources: - service.yaml - deployment.yaml - ingress.yaml -# - http-route.yaml + - http-route.yaml diff --git a/apps/media/plex/service.yaml b/apps/media/plex/service.yaml index 81831d8..cf18de3 100644 --- a/apps/media/plex/service.yaml +++ b/apps/media/plex/service.yaml @@ -2,10 +2,13 @@ apiVersion: v1 kind: Service metadata: name: plex + annotations: + io.cilium/lb-ipam-ips: 192.168.1.132 spec: selector: app: plex type: LoadBalancer ports: - - name: web - port: 32400 \ No newline at end of file + - name: http + port: 80 + targetPort: 32400 \ No newline at end of file diff --git a/apps/test/cuda-test/pod.yaml b/apps/test/cuda-test/pod.yaml index aa3bef0..a7b6909 100644 --- a/apps/test/cuda-test/pod.yaml +++ b/apps/test/cuda-test/pod.yaml @@ -4,10 +4,10 @@ metadata: name: cuda-vectoradd namespace: cuda-test spec: - restartPolicy: OnFailure + restartPolicy: Never #OnFailure containers: - name: cuda-vectoradd image: "nvcr.io/nvidia/k8s/cuda-sample:vectoradd-cuda11.7.1-ubuntu20.04" - resources: - limits: - nvidia.com/gpu: "1" \ No newline at end of file +# resources: +# limits: +# nvidia.com/gpu: "1" \ No newline at end of file diff --git a/infra/argocd/kustomization.yaml b/infra/argocd/kustomization.yaml index 982ed43..2653792 100644 --- a/infra/argocd/kustomization.yaml +++ b/infra/argocd/kustomization.yaml @@ -13,7 +13,7 @@ helmCharts: resources: - namespace.yaml - traefik-forward-auth-secrets.yaml - - https://raw.githubusercontent.com/argoproj/argo-cd/v2.9.2/manifests/install.yaml + - https://raw.githubusercontent.com/argoproj/argo-cd/v2.10.0/manifests/install.yaml - ingress.yaml - argocd-cm-cmp-kustomize-build-with-helm.yaml diff --git a/infra/cilium/announce.yaml b/infra/cilium/announce.yaml index dbe67aa..14f52b2 100644 --- a/infra/cilium/announce.yaml +++ b/infra/cilium/announce.yaml @@ -4,7 +4,5 @@ metadata: name: default-l2-announcement-policy namespace: kube-system spec: - interfaces: - - enp0s25 externalIPs: true loadBalancerIPs: true diff --git a/infra/cilium/ip-pool.yaml b/infra/cilium/ip-pool.yaml index aaee9c5..8dcdfc5 100644 --- a/infra/cilium/ip-pool.yaml +++ b/infra/cilium/ip-pool.yaml @@ -4,5 +4,6 @@ metadata: name: default-pool namespace: kube-system spec: - cidrs: - - cidr: 192.168.1.128/25 \ No newline at end of file + blocks: + - start: 192.168.1.128 + stop: 192.168.1.199 \ No newline at end of file diff --git a/infra/cilium/values.yaml b/infra/cilium/values.yaml index 0b9398a..8339856 100644 --- a/infra/cilium/values.yaml +++ b/infra/cilium/values.yaml @@ -15,12 +15,12 @@ operator: # Roll out cilium agent pods automatically when ConfigMap is updated. rollOutCiliumPods: true -#debug: -# enabled: true +debug: + enabled: true # Increase rate limit when doing L2 announcements k8sClientRateLimit: - qps: 100 + qps: 50 burst: 200 l2announcements: diff --git a/infra/net-aux/config/cloudflared/config.yaml b/infra/net-aux/config/cloudflared/config.yaml index ef1b41d..656895a 100644 --- a/infra/net-aux/config/cloudflared/config.yaml +++ b/infra/net-aux/config/cloudflared/config.yaml @@ -9,14 +9,6 @@ warp-routing: ingress: - hostname: hello.stonegarden.dev service: hello_world - - hostname: hallo.stonegarden.dev - service: hello_world - originRequest: - access: - required: true - teamName: stonegarden - audTag: - - aud1 d34ec64c62e56195ac6158dbfbeae62155d110f5c3a3b7e949572916dc57a6f3 - hostname: ssh.stonegarden.dev service: ssh://192.168.1.12:22 - hostname: blog.stonegarden.dev diff --git a/infra/net-aux/config/pi-hole/02-custom.conf b/infra/net-aux/config/pi-hole/02-custom.conf index 3080510..04a7d0d 100644 --- a/infra/net-aux/config/pi-hole/02-custom.conf +++ b/infra/net-aux/config/pi-hole/02-custom.conf @@ -1,9 +1,9 @@ -address=/stonegarden.dev/192.168.1.142 +#address=/stonegarden.dev/192.168.1.142 address=/blog.stonegarden.dev/192.168.1.172 address=/gateway.stonegarden.dev/192.168.1.172 address=/hass.stonegarden.dev/192.168.1.172 address=/jellyfin.stonegarden.dev/192.168.1.172 -#address=/plex.stonegarden.dev/192.168.1.172 +address=/plex.stonegarden.dev/192.168.1.172 address=/postgres.stonegarden.dev/192.168.1.172 address=/remark42.stonegarden.dev/192.168.1.172 edns-packet-max=1232 diff --git a/infra/nvidia-device-plugin/kustomization.yaml b/infra/nvidia-device-plugin/kustomization.yaml index 6888c39..ab4ef89 100644 --- a/infra/nvidia-device-plugin/kustomization.yaml +++ b/infra/nvidia-device-plugin/kustomization.yaml @@ -5,13 +5,13 @@ commonAnnotations: resources: - namespace.yaml - - cm-time-slicing.yaml +# - cm-time-slicing.yaml -helmCharts: - - name: nvidia-device-plugin - repo: https://nvidia.github.io/k8s-device-plugin - version: 0.14.3 - releaseName: "nvidia-device-plugin" - namespace: nvidia-device-plugin - includeCRDs: true - valuesFile: values.yaml +#helmCharts: +# - name: nvidia-device-plugin +# repo: https://nvidia.github.io/k8s-device-plugin +# version: 0.14.3 +# releaseName: "nvidia-device-plugin" +# namespace: nvidia-device-plugin +# includeCRDs: true +# valuesFile: values.yaml diff --git a/infra/pi-hole/config/02-custom.conf b/infra/pi-hole/config/02-custom.conf index 3080510..04a7d0d 100644 --- a/infra/pi-hole/config/02-custom.conf +++ b/infra/pi-hole/config/02-custom.conf @@ -1,9 +1,9 @@ -address=/stonegarden.dev/192.168.1.142 +#address=/stonegarden.dev/192.168.1.142 address=/blog.stonegarden.dev/192.168.1.172 address=/gateway.stonegarden.dev/192.168.1.172 address=/hass.stonegarden.dev/192.168.1.172 address=/jellyfin.stonegarden.dev/192.168.1.172 -#address=/plex.stonegarden.dev/192.168.1.172 +address=/plex.stonegarden.dev/192.168.1.172 address=/postgres.stonegarden.dev/192.168.1.172 address=/remark42.stonegarden.dev/192.168.1.172 edns-packet-max=1232