diff --git a/app-files/core-deployments.yaml b/app-files/core-deployments.yaml index 3a3903b..2613968 100644 --- a/app-files/core-deployments.yaml +++ b/app-files/core-deployments.yaml @@ -2,24 +2,24 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: nginx-ingress + name: traefik namespace: argocd spec: project: default sources: - - repoURL: https://helm.nginx.com/stable - chart: nginx-ingress - targetRevision: 1.1.2 + - repoURL: https://traefik.github.io/charts + chart: traefik + targetRevision: 26.0.0 helm: - releaseName: nginx + releaseName: traefik valueFiles: - - $values/ingress/values.yaml + - $values/traefik/values.yaml - repoURL: https://git.ar21.de/yolokube/core-deployments.git targetRevision: HEAD ref: values destination: server: https://kubernetes.default.svc - namespace: nginx-ingress + namespace: traefik syncPolicy: syncOptions: - CreateNamespace=true diff --git a/examples/example-deployment.yaml b/examples/example-deployment.yaml index 35b9b7c..df94a40 100644 --- a/examples/example-deployment.yaml +++ b/examples/example-deployment.yaml @@ -69,7 +69,7 @@ metadata: namespace: example #annotations: # Use for Basic auth: - # traefik.ingress.kubernetes.io/router.middlewares: default-basic-auth@kubernetescrd + # traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd spec: rules: - host: "example.apps.yolokube.de" diff --git a/longhorn/values.yaml b/longhorn/values.yaml index 997f65f..737bc84 100644 --- a/longhorn/values.yaml +++ b/longhorn/values.yaml @@ -25,7 +25,7 @@ ingress: ingressClassName: nginx host: longhorn.services.yolokube.de annotations: - nginx.org/basic-auth-secret: longhorn-basic-auth-secret + traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd metrics: serviceMonitor: enabled: true diff --git a/prometheus/values.yaml b/prometheus/values.yaml index fd72a50..dbf3935 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -60,7 +60,7 @@ alertmanager: hosts: - alertmanager.services.yolokube.de annotations: - nginx.org/basic-auth-secret: prometheus-basic-auth-secret + traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd ingressPerReplica: pathType: ImplementationSpecific paths: @@ -70,7 +70,7 @@ alertmanager: hostPrefix: alertmanager hostDomain: services.yolokube.de annotations: - nginx.org/basic-auth-secret: prometheus-basic-auth-secret + traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd servicePerReplica: enabled: true podAntiAffinity: "hard" @@ -107,7 +107,7 @@ prometheus: hosts: - prometheus.services.yolokube.de annotations: - nginx.org/basic-auth-secret: prometheus-basic-auth-secret + traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd ingressPerReplica: pathType: ImplementationSpecific paths: @@ -116,7 +116,7 @@ prometheus: hostPrefix: prometheus hostDomain: services.yolokube.de annotations: - nginx.org/basic-auth-secret: prometheus-basic-auth-secret + traefik.ingress.kubernetes.io/router.middlewares: traefik-basic-auth@kubernetescrd prometheusSpec: retentionSize: "45GB" replicas: 2