From 8c3ae1bf0605e96ee647071a1213ccfcfdd2390f Mon Sep 17 00:00:00 2001 From: motoki317 Date: Sat, 27 Jul 2024 11:45:14 +0900 Subject: [PATCH] Fix local test scripts --- .local-dev/config/ns.yaml | 4 ++++ .../traefik/dashboard-ingress-route.yaml | 16 ++++++++-------- .local-manifest/traefik/dashboard-service.yaml | 13 ------------- .local-manifest/traefik/kustomization.yaml | 1 - .../traefik/traefik-cluster-role.yaml | 10 ++++++++-- .../traefik/traefik-stateful-set.yaml | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 .local-manifest/traefik/dashboard-service.yaml diff --git a/.local-dev/config/ns.yaml b/.local-dev/config/ns.yaml index b7dd46cfe..1ed5415be 100644 --- a/.local-dev/config/ns.yaml +++ b/.local-dev/config/ns.yaml @@ -126,6 +126,10 @@ components: type: traefik traefik: priorityOffset: 0 + service: + ipFamilies: + - IPv4 + ipFamilyPolicy: SingleStack tls: type: traefik traefik: diff --git a/.local-manifest/traefik/dashboard-ingress-route.yaml b/.local-manifest/traefik/dashboard-ingress-route.yaml index 9b33fcf39..04821da1d 100644 --- a/.local-manifest/traefik/dashboard-ingress-route.yaml +++ b/.local-manifest/traefik/dashboard-ingress-route.yaml @@ -9,12 +9,12 @@ spec: - websecure routes: - kind: Rule - match: Host(`traefik-dashboard.local.trapti.tech`) + match: Host(`traefik.local.trapti.tech`) services: - - namespace: traefik - kind: Service - name: dashboard - port: dashboard - scheme: http - strategy: RoundRobin - weight: 1 + - kind: TraefikService + name: dashboard@internal + - kind: Rule + match: Host(`traefik.local.trapti.tech`) && PathPrefix(`/api`) + services: + - kind: TraefikService + name: api@internal diff --git a/.local-manifest/traefik/dashboard-service.yaml b/.local-manifest/traefik/dashboard-service.yaml deleted file mode 100644 index 46b8c5c25..000000000 --- a/.local-manifest/traefik/dashboard-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: dashboard - -spec: - type: ClusterIP - ports: - - targetPort: dashboard - name: dashboard - port: 80 - selector: - app: traefik diff --git a/.local-manifest/traefik/kustomization.yaml b/.local-manifest/traefik/kustomization.yaml index 602fa42be..128000c69 100644 --- a/.local-manifest/traefik/kustomization.yaml +++ b/.local-manifest/traefik/kustomization.yaml @@ -6,5 +6,4 @@ resources: - traefik-role-binding.yaml - traefik-stateful-set.yaml - traefik-service.yaml - - dashboard-service.yaml - dashboard-ingress-route.yaml diff --git a/.local-manifest/traefik/traefik-cluster-role.yaml b/.local-manifest/traefik/traefik-cluster-role.yaml index 527a2802e..21878f544 100644 --- a/.local-manifest/traefik/traefik-cluster-role.yaml +++ b/.local-manifest/traefik/traefik-cluster-role.yaml @@ -8,8 +8,8 @@ rules: - "" resources: - services - - endpoints - secrets + - nodes verbs: - get - list @@ -33,7 +33,6 @@ rules: - update - apiGroups: - traefik.io - - traefik.containo.us resources: - middlewares - middlewaretcps @@ -49,3 +48,10 @@ rules: - get - list - watch + - apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - list + - watch diff --git a/.local-manifest/traefik/traefik-stateful-set.yaml b/.local-manifest/traefik/traefik-stateful-set.yaml index c7528e188..e47125d8b 100644 --- a/.local-manifest/traefik/traefik-stateful-set.yaml +++ b/.local-manifest/traefik/traefik-stateful-set.yaml @@ -21,7 +21,7 @@ spec: containers: - name: traefik - image: traefik:2.10 + image: traefik:3.1 args: - --api.insecure - --providers.kubernetescrd