diff --git a/infrastructure/addons/flux-ui/kustomization.yaml b/infrastructure/addons/flux-ui/kustomization.yaml index b3bd793..fdbd85a 100644 --- a/infrastructure/addons/flux-ui/kustomization.yaml +++ b/infrastructure/addons/flux-ui/kustomization.yaml @@ -4,5 +4,4 @@ resources: - cluster-user-auth-externalsecret.yaml - gitrepository-weave-gitops.yaml - helmrelease-weave-gitops.yaml - - traefik-helmchartconfig-flux-entrypoint.yaml - ingress-flux-ui.yaml diff --git a/infrastructure/addons/kustomization-flux-ui.yaml b/infrastructure/addons/kustomization-flux-ui.yaml index 729ef5c..03e44ed 100644 --- a/infrastructure/addons/kustomization-flux-ui.yaml +++ b/infrastructure/addons/kustomization-flux-ui.yaml @@ -11,6 +11,7 @@ spec: name: platform path: ./infrastructure/addons/flux-ui dependsOn: + - name: addon-traefik-config - name: addon-external-secrets wait: true timeout: 5m diff --git a/infrastructure/addons/kustomization-rancher.yaml b/infrastructure/addons/kustomization-rancher.yaml index c707201..bc0f4e6 100644 --- a/infrastructure/addons/kustomization-rancher.yaml +++ b/infrastructure/addons/kustomization-rancher.yaml @@ -14,4 +14,5 @@ spec: timeout: 15m suspend: false dependsOn: + - name: addon-traefik-config - name: addon-tailscale-operator diff --git a/infrastructure/addons/kustomization-traefik-config.yaml b/infrastructure/addons/kustomization-traefik-config.yaml new file mode 100644 index 0000000..a036d89 --- /dev/null +++ b/infrastructure/addons/kustomization-traefik-config.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: addon-traefik-config + namespace: flux-system +spec: + interval: 10m + prune: true + sourceRef: + kind: GitRepository + name: platform + path: ./infrastructure/addons/traefik-config + wait: true + timeout: 5m + suspend: false diff --git a/infrastructure/addons/kustomization.yaml b/infrastructure/addons/kustomization.yaml index a7aaabe..b9cbf64 100644 --- a/infrastructure/addons/kustomization.yaml +++ b/infrastructure/addons/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization resources: - kustomization-ccm.yaml - kustomization-csi.yaml + - kustomization-traefik-config.yaml - kustomization-external-secrets.yaml - kustomization-flux-ui.yaml - kustomization-tailscale-operator.yaml diff --git a/infrastructure/addons/rancher/kustomization.yaml b/infrastructure/addons/rancher/kustomization.yaml index 78a86fc..b31cb0f 100644 --- a/infrastructure/addons/rancher/kustomization.yaml +++ b/infrastructure/addons/rancher/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml - helmrepository-rancher.yaml - helmrelease-rancher.yaml - - traefik-helmchartconfig-rancher-entrypoint.yaml - ingress-rancher.yaml - rancher-bootstrap-password-externalsecret.yaml diff --git a/infrastructure/addons/rancher/namespace.yaml b/infrastructure/addons/rancher/namespace.yaml new file mode 100644 index 0000000..35597d8 --- /dev/null +++ b/infrastructure/addons/rancher/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: cattle-system diff --git a/infrastructure/addons/rancher/traefik-helmchartconfig-rancher-entrypoint.yaml b/infrastructure/addons/traefik-config/helmchartconfig-traefik.yaml similarity index 87% rename from infrastructure/addons/rancher/traefik-helmchartconfig-rancher-entrypoint.yaml rename to infrastructure/addons/traefik-config/helmchartconfig-traefik.yaml index 210dcab..d971a14 100644 --- a/infrastructure/addons/rancher/traefik-helmchartconfig-rancher-entrypoint.yaml +++ b/infrastructure/addons/traefik-config/helmchartconfig-traefik.yaml @@ -6,6 +6,7 @@ metadata: spec: valuesContent: |- additionalArguments: + - "--entryPoints.flux.address=:9001/tcp" - "--entryPoints.rancher.address=:9442/tcp" ports: rancher: diff --git a/infrastructure/addons/traefik-config/kustomization.yaml b/infrastructure/addons/traefik-config/kustomization.yaml new file mode 100644 index 0000000..92aabda --- /dev/null +++ b/infrastructure/addons/traefik-config/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmchartconfig-traefik.yaml