Skip to content

Commit

Permalink
Merge pull request #8 from scroll-tech/remove-lb-annotations
Browse files Browse the repository at this point in the history
remove service annotations and add ingress instead
  • Loading branch information
sbaizet-ledger authored May 24, 2024
2 parents 831fa1b + 6e74062 commit cc440f6
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion charts/scroll-stack/charts/blockscout/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ingress:
labels: {}
ingressClassName: "nginx"
hosts:
- host: blockscout.devnet.scroll.tech
- host: blockscout.local
paths:
- path: /
pathType: Prefix
19 changes: 13 additions & 6 deletions charts/scroll-stack/charts/bridge-history-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions charts/scroll-stack/charts/coordinator-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 13 additions & 6 deletions charts/scroll-stack/charts/frontends/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
11 changes: 3 additions & 8 deletions charts/scroll-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
Expand All @@ -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/`
Expand Down

0 comments on commit cc440f6

Please sign in to comment.