diff --git a/k8s/riju-proxy.yaml b/k8s/riju-proxy.yaml index 7e1543d..af77258 100644 --- a/k8s/riju-proxy.yaml +++ b/k8s/riju-proxy.yaml @@ -98,27 +98,13 @@ apiVersion: v1 metadata: namespace: riju name: riju-proxy + annotations: + metallb.universe.tf/allow-shared-ip: main spec: + type: LoadBalancer selector: app: riju-proxy ports: - name: http port: 3128 targetPort: 3128 - ---- -kind: IngressRoute -apiVersion: traefik.containo.us/v1alpha1 -metadata: - namespace: riju - name: riju-proxy -spec: - entryPoints: - - proxy - routes: - - kind: Rule - match: "PathPrefix(`/`)" - services: - - namespace: riju - name: riju-proxy - port: 3128 diff --git a/k8s/traefik-config.in.yaml b/k8s/traefik-config.in.yaml index a4942fe..041bc8c 100644 --- a/k8s/traefik-config.in.yaml +++ b/k8s/traefik-config.in.yaml @@ -7,13 +7,6 @@ metadata: data: traefik.yaml: | entryPoints: - proxy: - address: ":3128" - http: - tls: - certResolver: riju - domains: - - main: k8s.riju.codes http: address: ":8000" https: diff --git a/k8s/traefik.yaml b/k8s/traefik.yaml index 78a3f26..f3a8a0f 100644 --- a/k8s/traefik.yaml +++ b/k8s/traefik.yaml @@ -119,13 +119,13 @@ apiVersion: v1 metadata: namespace: traefik name: traefik + annotations: + metallb.universe.tf/allow-shared-ip: main spec: type: LoadBalancer selector: app: traefik ports: - - port: 3128 - name: squid - port: 80 name: http targetPort: 8000