diff --git a/alertmanager/argocd.yaml b/alertmanager/argocd.yaml index a7a5d8a..0b4f9ac 100644 --- a/alertmanager/argocd.yaml +++ b/alertmanager/argocd.yaml @@ -91,6 +91,21 @@ spec: httpGet: path: /health port: http + + ingress: + enabled: true + ingressClassName: traefik + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd + hosts: + - karma0213.kro.kr + path: / + pathType: Prefix + tls: + - secretName: karma-tls + hosts: + - karma0213.kro.kr destination: server: https://kubernetes.default.svc namespace: alertmanager diff --git a/alertmanager/ingress.yaml b/alertmanager/ingress.yaml deleted file mode 100644 index 24ba43d..0000000 --- a/alertmanager/ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: karma-ingress - namespace: alertmanager - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod - traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd -spec: - ingressClassName: traefik - tls: - - hosts: - - karma0213.kro.kr - secretName: karma-tls - rules: - - host: karma0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: karma - port: - number: 8080 diff --git a/alertmanager/kustomization.yaml b/alertmanager/kustomization.yaml index 31e0fad..1e799f7 100644 --- a/alertmanager/kustomization.yaml +++ b/alertmanager/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ingress.yaml - - servicemonitor.yaml - - vault/alertmanager-secrets.yaml +- manifests/servicemonitor.yaml +- vault/alertmanager-secrets.yaml diff --git a/alertmanager/servicemonitor.yaml b/alertmanager/manifests/servicemonitor.yaml similarity index 100% rename from alertmanager/servicemonitor.yaml rename to alertmanager/manifests/servicemonitor.yaml diff --git a/goldilocks/helm-values.yaml b/goldilocks/helm-values.yaml index b8ffab2..7a26341 100644 --- a/goldilocks/helm-values.yaml +++ b/goldilocks/helm-values.yaml @@ -18,17 +18,21 @@ dashboard: type: ClusterIP port: 80 - # Ingress configuration (optional) ingress: - enabled: false - # Uncomment below to enable ingress - # enabled: true - # ingressClassName: nginx - # hosts: - # - host: goldilocks.example.com - # paths: - # - path: / - # type: Prefix + enabled: true + ingressClassName: traefik + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd + hosts: + - host: goldilocks0213.kro.kr + paths: + - path: / + type: Prefix + tls: + - secretName: goldilocks-dashboard-tls + hosts: + - goldilocks0213.kro.kr # Controller configuration controller: diff --git a/goldilocks/ingress.yaml b/goldilocks/ingress.yaml deleted file mode 100644 index 7f4ca34..0000000 --- a/goldilocks/ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: goldilocks-dashboard-ingress - namespace: goldilocks - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" - traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd -spec: - ingressClassName: traefik - tls: - - hosts: - - goldilocks0213.kro.kr - secretName: goldilocks-dashboard-tls - rules: - - host: goldilocks0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: goldilocks-dashboard - port: - number: 80 diff --git a/goldilocks/kustomization.yaml b/goldilocks/kustomization.yaml index bd43e8a..b83b23e 100644 --- a/goldilocks/kustomization.yaml +++ b/goldilocks/kustomization.yaml @@ -1,4 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: -- ingress.yaml +resources: [] diff --git a/grafana/helm-values.yaml b/grafana/helm-values.yaml index 9a96e3f..c61c5ed 100644 --- a/grafana/helm-values.yaml +++ b/grafana/helm-values.yaml @@ -72,3 +72,18 @@ grafana.ini: disable_signout_menu: true news: news_feed_enabled: false + +ingress: + enabled: true + ingressClassName: traefik + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd + hosts: + - grafana0213.kro.kr + - www.grafana0213.kro.kr + tls: + - secretName: grafana-tls + hosts: + - grafana0213.kro.kr + - www.grafana0213.kro.kr diff --git a/grafana/ingress.yaml b/grafana/ingress.yaml deleted file mode 100644 index c74bee9..0000000 --- a/grafana/ingress.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: grafana-ingress - namespace: grafana - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" - traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd -spec: - ingressClassName: traefik - # TLS 설정 - tls: - - hosts: - - grafana0213.kro.kr - - www.grafana0213.kro.kr - secretName: grafana-tls - rules: - - host: grafana0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: grafana - port: - number: 80 - - host: www.grafana0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: grafana - port: - number: 80 diff --git a/grafana/kustomization.yaml b/grafana/kustomization.yaml index af24a3b..a2df37e 100644 --- a/grafana/kustomization.yaml +++ b/grafana/kustomization.yaml @@ -2,7 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - vault/grafana-admin-password.yaml -- ingress.yaml - -# Dashboard JSON files are stored in dashboards/ for manual import reference -# Auto-provisioning disabled due to ConfigMap size limits diff --git a/uptime-kuma/helm-values.yaml b/uptime-kuma/helm-values.yaml index 4bcb314..ebaa1fe 100644 --- a/uptime-kuma/helm-values.yaml +++ b/uptime-kuma/helm-values.yaml @@ -30,3 +30,19 @@ serviceMonitor: enabled: true namespace: prometheus interval: 60s + +ingress: + enabled: true + className: traefik + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd + hosts: + - host: kuma0213.kro.kr + paths: + - path: / + pathType: Prefix + tls: + - secretName: uptime-kuma-tls + hosts: + - kuma0213.kro.kr diff --git a/uptime-kuma/ingress.yaml b/uptime-kuma/ingress.yaml deleted file mode 100644 index 3c9997e..0000000 --- a/uptime-kuma/ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: uptime-kuma-ingress - namespace: uptime-kuma - annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" - traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd -spec: - ingressClassName: traefik - tls: - - hosts: - - kuma0213.kro.kr - secretName: uptime-kuma-tls - rules: - - host: kuma0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: uptime-kuma - port: - number: 3001 diff --git a/uptime-kuma/kustomization.yaml b/uptime-kuma/kustomization.yaml index 14d8f3a..b83b23e 100644 --- a/uptime-kuma/kustomization.yaml +++ b/uptime-kuma/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - ingress.yaml +resources: []