Skip to content

Commit eac1e76

Browse files
Rub21Rub21
committed
Disable ALB in helm deployment
1 parent 9cdfcad commit eac1e76

File tree

5 files changed

+18
-91
lines changed

5 files changed

+18
-91
lines changed

‎.github/workflows/chartpress.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- 'main'
66
- 'staging'
7-
- 'cloudflare_tunnel'
7+
- 'disable_alb'
88
jobs:
99
build:
1010
runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
7171
OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }}
7272
################ Staging secrets ################
7373
- name: Staging - substitute secrets
74-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/cloudflare_tunnel'
74+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/disable_alb'
7575
uses: bluwy/substitute-string-action@v1
7676
with:
7777
_input-file: 'values.staging.template.yaml'
@@ -189,14 +189,14 @@ jobs:
189189
PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }}
190190

191191
- name: AWS Credentials
192-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/cloudflare_tunnel'
192+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/disable_alb'
193193
uses: aws-actions/configure-aws-credentials@v1
194194
with:
195195
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
196196
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
197197
aws-region: us-east-1
198198
- name: Setup Kubectl and Helm Dependencies
199-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/cloudflare_tunnel'
199+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/disable_alb'
200200
run: |
201201
sudo pip install awscli --ignore-installed six
202202
sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl
@@ -210,22 +210,22 @@ jobs:
210210
helm version
211211
212212
- name: Update kube-config staging
213-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/cloudflare_tunnel'
213+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/disable_alb'
214214
run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging
215215
- name: Update kube-config prod
216216
if: github.ref == 'refs/heads/main'
217217
run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2
218218
- name: Add Helm repository
219-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/cloudflare_tunnel'
219+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/disable_alb'
220220
run: |
221221
helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/
222222
helm repo update
223223
- name: Install helm dependencies for
224-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/cloudflare_tunnel'
224+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/disable_alb'
225225
run: cd ohm && helm dep up
226226
# Staging
227227
- name: Staging - helm deploy
228-
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/cloudflare_tunnel'
228+
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/disable_alb'
229229
run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
230230
# Production
231231
- name: Production - helm deploy

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ images/tiler-server/vtiles_languages.geojson
3131
hetzner/*/.envs.*.production
3232
.vscode
3333
hetzner/traefik/cloudflare-ips.txt
34-
hetzner/traefik/traefik.yml
34+
hetzner/traefik/traefik.yml
35+
.vscode/

‎ohm/requirements.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies:
22
- name: osm-seed
3-
version: '0.1.0-0.dev.git.984.he0afc57'
4-
repository: https://osm-seed.github.io/osm-seed-chart/
3+
version: '0.1.0-0.dev.git.984.h985db07'
4+
repository: https://osm-seed.github.io/osm-seed-chart/

‎values.production.template.yaml‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,9 @@ osm-seed:
1414
# ====================================================================================================
1515
AWS_S3_BUCKET: {{PRODUCTION_S3_BUCKET}}
1616

17-
# AWS SSL ARN
18-
AWS_SSL_ARN: {{PRODUCTION_AWS_SSL_ARN}}
19-
20-
# Specify serviceType.
21-
#
22-
# serviceType can be one of three values: 'NodePort', 'ClusterIP' or 'LoadBalancer'
23-
# Use `NodePort` for local testing on minikube.
24-
#
25-
# The recommended setting is `ClusterIP`, and then following the instructions to
26-
# point a DNS record to the cluster IP address. This will setup the ingress rules
27-
# for all services as subdomains and configure SSL using Lets Encrypt.
28-
#
29-
# If you specify `LoadBalancer` as the service type, if you also specify
30-
# an `AWS_SSL_ARN` that is a wildcart certificate, that will be configured
31-
# as the SSL certificate for your services. Else, you will need to configure
32-
# SSL separately.
17+
# Traffic is routed via Cloudflare Tunnel, which connects directly to ClusterIP Services.
18+
# No Ingress resources or load balancers (ALB/NLB) are needed.
3319
serviceType: ClusterIP
34-
ingressClassNameType: "alb" # ALB works with ACM
35-
ingressClassName: alb
36-
alb:
37-
certificateArn: {{PRODUCTION_AWS_SSL_ARN}}
38-
enableWaf:
39-
enabled: true
40-
wafAclArn: {{PRODUCTION_AWS_WAF_WEBACL_ARN}}
41-
# Domain that is pointed to the clusterIP
42-
# You will need to create an A record like *.osmseed.example.com pointed to the ClusterIP
43-
# Then, the cluster configuration will setup services at their respective subdomains:
44-
# - web.osmseed.example.com
45-
# - overpass.osmseed.example.com
46-
# - nominatim.osmseed.example.com
47-
# - etc.
4820
domain: openhistoricalmap.org
4921

5022
# ====================================================================================================

‎values.staging.template.yaml‎

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ osm-seed:
66
# ====================================================================================================
77
# ====================================================================================================
88

9-
# The version of the image group in osm-seed, get it here: https://hub.docker.com/r/developmentseed/osmseed-web/tags/
9+
# The version of the image group in osm-seed, get it here: https://github.com/orgs/osm-seed/packages
1010
# osmSeedVersion: ohm-b8a0ed1
1111

1212
environment: staging
@@ -18,46 +18,11 @@ osm-seed:
1818
# ====================================================================================================
1919
AWS_S3_BUCKET: {{STAGING_S3_BUCKET}}
2020

21-
# ====================================================
22-
# AWS: Specify ARN for SSL certificate, currently assumes a single wildcard cert
23-
# ====================================================
24-
25-
AWS_SSL_ARN: {{STAGING_AWS_SSL_ARN}}
26-
27-
# Specify serviceType.
28-
#
29-
# serviceType can be one of three values: 'NodePort', 'ClusterIP' or 'LoadBalancer'
30-
# Use `NodePort` for local testing on minikube.
31-
#
32-
# The recommended setting is `ClusterIP`, and then following the instructions to
33-
# point a DNS record to the cluster IP address. This will setup the ingress rules
34-
# for all services as subdomains and configure SSL using Lets Encrypt.
35-
#
36-
# If you specify `LoadBalancer` as the service type, if you also specify
37-
# an `AWS_SSL_ARN` that is a wildcart certificate, that will be configured
38-
# as the SSL certificate for your services. Else, you will need to configure
39-
# SSL separately.
21+
# Traffic is routed via Cloudflare Tunnel, which connects directly to ClusterIP Services.
22+
# No Ingress resources or load balancers (ALB/NLB) are needed.
4023
serviceType: ClusterIP
41-
ingressClassNameType: "alb"
42-
ingressClassName: alb
43-
alb:
44-
certificateArn: {{STAGING_AWS_SSL_ARN}}
45-
enableWaf:
46-
enabled: true
47-
wafAclArn: {{STAGING_AWS_WAF_WEBACL_ARN}}
48-
# Domain that is pointed to the clusterIP
49-
# You will need to create an A record like *.osmseed.example.com pointed to the ClusterIP
50-
# Then, the cluster configuration will setup services at their respective subdomains:
51-
# - web.osmseed.example.com
52-
# - overpass.osmseed.example.com
53-
# - nominatim.osmseed.example.com
54-
# - etc.
5524
domain: ohmstaging.org
5625

57-
# ====================================================================================================
58-
# Configuration for Lets Encrypt setup
59-
# ====================================================================================================
60-
6126
# Admin Email address used when generating Lets Encrypt certificates.
6227
# You will be notified of expirations, etc. on this email address.
6328
adminEmail: [email protected]
@@ -155,8 +120,6 @@ osm-seed:
155120
enabled: true
156121
name: ohm-s3-bucket-access-staging
157122
replicaCount: 1
158-
serviceAnnotations:
159-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
160123
ingressDomain: www.ohmstaging.org
161124
env:
162125
MAILER_ADDRESS: {{MAILER_ADDRESS}}
@@ -610,8 +573,6 @@ osm-seed:
610573
ip: {{STAGING_TILER_SERVER_HOST}}
611574
port: 9091
612575
replicaCount: 1
613-
serviceAnnotations:
614-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
615576
ingressDomain: vtiles.ohmstaging.org
616577
env:
617578
TILER_SERVER_PORT: 9090
@@ -716,8 +677,6 @@ osm-seed:
716677
enabled: false
717678
priorityClass: medium-priority
718679
replicaCount: 1
719-
serviceAnnotations:
720-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '300'
721680
ingressDomain: tm-api.ohmstaging.org
722681
healthCheckPath: /health
723682
env:
@@ -790,8 +749,6 @@ osm-seed:
790749
ip: {{STAGING_NOMINATIM_HOST}}
791750
port: 8083
792751
priorityClass: medium-priority
793-
serviceAnnotations:
794-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '300'
795752
ingressDomain: nominatim.ohmstaging.org
796753
replicaCount: 1
797754
env:
@@ -840,8 +797,6 @@ osm-seed:
840797
ip: {{STAGING_OVERPASS_HOST}}
841798
port: 8086
842799
priorityClass: medium-priority
843-
serviceAnnotations:
844-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
845800
ingressDomain: overpass-api.ohmstaging.org
846801
env:
847802
OVERPASS_META: 'attic'
@@ -876,8 +831,6 @@ osm-seed:
876831
serviceAccount:
877832
enabled: true
878833
name: ohm-s3-bucket-access-staging
879-
serviceAnnotations:
880-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
881834
ingressDomain: taginfo.ohmstaging.org
882835
env:
883836
URL_PLANET_FILE_STATE: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/state.txt
@@ -1133,3 +1086,4 @@ ohm:
11331086
enabled: true
11341087
label_key: nodegroup_type
11351088
label_value: web_medium
1089+

0 commit comments

Comments
 (0)