From 6e74062171fe18eb71e9485e8fa56728709ecdc1 Mon Sep 17 00:00:00 2001 From: "sebastien.baizet" Date: Fri, 24 May 2024 11:43:52 +0200 Subject: [PATCH] remove service annotations and add ingress instead --- .../charts/blockscout/values.yaml | 2 +- .../charts/bridge-history-api/values.yaml | 19 +++++++++++++------ .../charts/coordinator-api/values.yaml | 6 ------ .../scroll-stack/charts/frontends/values.yaml | 19 +++++++++++++------ charts/scroll-stack/values.yaml | 11 +++-------- readme.md | 4 ++-- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/charts/scroll-stack/charts/blockscout/values.yaml b/charts/scroll-stack/charts/blockscout/values.yaml index 477ef97d..2f98d719 100644 --- a/charts/scroll-stack/charts/blockscout/values.yaml +++ b/charts/scroll-stack/charts/blockscout/values.yaml @@ -159,7 +159,7 @@ ingress: labels: {} ingressClassName: "nginx" hosts: - - host: blockscout.devnet.scroll.tech + - host: blockscout.local paths: - path: / pathType: Prefix diff --git a/charts/scroll-stack/charts/bridge-history-api/values.yaml b/charts/scroll-stack/charts/bridge-history-api/values.yaml index 5a738d8e..61ad2723 100644 --- a/charts/scroll-stack/charts/bridge-history-api/values.yaml +++ b/charts/scroll-stack/charts/bridge-history-api/values.yaml @@ -34,12 +34,6 @@ service: enabled: true port: 8090 targetPort: 8090 - annotations: - external-dns.alpha.kubernetes.io/hostname: scroll-stack-bridge-history-api.devnet.scroll.tech - service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*" - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - type: LoadBalancer persistence: bridge-history-api: @@ -77,6 +71,19 @@ additionalContainers: name: redis image: redis +ingress: + main: + enabled: true + primary: true + annotations: {} + labels: {} + ingressClassName: "nginx" + hosts: + - host: bridge-history-api.local + paths: + - path: / + pathType: Prefix + serviceMonitor: main: enabled: true diff --git a/charts/scroll-stack/charts/coordinator-api/values.yaml b/charts/scroll-stack/charts/coordinator-api/values.yaml index 9d343058..701892d2 100644 --- a/charts/scroll-stack/charts/coordinator-api/values.yaml +++ b/charts/scroll-stack/charts/coordinator-api/values.yaml @@ -69,12 +69,6 @@ service: enabled: true port: 8090 targetPort: 8090 - annotations: - external-dns.alpha.kubernetes.io/hostname: scroll-stack-coordinator-api.devnet.scroll.tech - service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*" - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - type: LoadBalancer defaultProbes: &default_probes enabled: false diff --git a/charts/scroll-stack/charts/frontends/values.yaml b/charts/scroll-stack/charts/frontends/values.yaml index edb8b23b..efd503e5 100644 --- a/charts/scroll-stack/charts/frontends/values.yaml +++ b/charts/scroll-stack/charts/frontends/values.yaml @@ -19,12 +19,6 @@ service: http: enabled: true port: 80 - annotations: - external-dns.alpha.kubernetes.io/hostname: scroll-stack-frontends.devnet.scroll.tech - service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*" - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - type: LoadBalancer resources: requests: @@ -49,3 +43,16 @@ probes: <<: *default_probes startup: <<: *default_probes + +ingress: + main: + enabled: true + primary: true + annotations: {} + labels: {} + ingressClassName: "nginx" + hosts: + - host: frontends.local + paths: + - path: / + pathType: Prefix \ No newline at end of file diff --git a/charts/scroll-stack/values.yaml b/charts/scroll-stack/values.yaml index cb3b1b30..fe9b8572 100644 --- a/charts/scroll-stack/values.yaml +++ b/charts/scroll-stack/values.yaml @@ -75,14 +75,9 @@ grafana: path: /var/lib/grafana/dashboards/default/ dashboardsConfigMaps: default: grafana-dashboards - service: + ingress: enabled: true - annotations: - external-dns.alpha.kubernetes.io/hostname: grafana.devnet.scroll.tech - service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*" - service.beta.kubernetes.io/aws-load-balancer-type: nlb - service.beta.kubernetes.io/aws-load-balancer-internal: "true" - type: LoadBalancer + hosts: ["grafana.local"] rollup-relayer: enabled: true @@ -104,7 +99,7 @@ loki-stack: nameOverride: loki #TODO a bit ugly, maybe we can make this dynamic ? promtail: - enabled: false + enabled: true fullnameOverride: promtail nameOverride: promtail config: diff --git a/readme.md b/readme.md index 04e96958..067c5fe8 100644 --- a/readme.md +++ b/readme.md @@ -38,7 +38,7 @@ Then go to your browser and check `http://localhost:8080/` 2. Using /etc/hosts If you enabled ingress on your cluster, you can add the following entries ```txt -1.2.3.4 blockscout.devnet +1.2.3.4 blockscout.local ``` where `1.2.3.4` is the ip of your cluster. Then go to your browser and check `http://blockscout.devnet/` @@ -53,7 +53,7 @@ Then go to your browser and check `http://localhost:8081/` 2. Using /etc/hosts If you enabled ingress on your cluster, you can add the following entries ```txt -1.2.3.4 grafana.devnet +1.2.3.4 grafana.local ``` where `1.2.3.4` is the ip of your cluster. Then go to your browser and check `http://grafana.devnet/`