Skip to content

Commit a97567e

Browse files
committed
refactor(frontend): refactor frontend files
1 parent 36d8b38 commit a97567e

12 files changed

Lines changed: 30 additions & 34 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
All deployment configs, CI/CD pipelines, and infrastructure setup for the Hankers project.
55

66
## Quick Access
7-
- **Frontend**: https://hankers-frontend.myaddr.tools
8-
- **Backend**: https://hankers-backend.myaddr.tools
9-
- **Grafana**: https://hankers-grafana.myaddr.tools (admin/admin)
7+
- **Frontend**: https://hankers.myaddr.tools
8+
- **Backend**: https://api.hankers.myaddr.tools
9+
- **Grafana**: https://grafana.hankers.myaddr.tools (admin/admin)
1010

1111
---
1212

@@ -212,7 +212,7 @@ kubectl scale deployment hankers-backend-prod --replicas=5 -n default
212212
helm rollback hankers-backend-prod -n default
213213

214214
# Check monitoring
215-
# Open: https://hankers-grafana.myaddr.tools
215+
# Open: https://grafana.hankers.myaddr.tools
216216
```
217217

218218
---

backend/helm-chart/values-dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ingress:
1818
cert-manager.io/cluster-issuer: "letsencrypt-prod"
1919
nginx.ingress.kubernetes.io/ssl-redirect: "true"
2020
hosts:
21-
- host: "api.hankers-frontend.myaddr.tools"
21+
- host: "api.hankers.myaddr.tools"
2222
paths:
2323
- path: /socket.io
2424
pathType: Prefix
@@ -27,7 +27,7 @@ ingress:
2727
tls:
2828
- secretName: backend-tls
2929
hosts:
30-
- api.hankers-frontend.myaddr.tools
30+
- api.hankers.myaddr.tools
3131

3232
migration:
3333
enabled: true

backend/helm-chart/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ingress:
2020
cert-manager.io/cluster-issuer: "letsencrypt-prod"
2121
nginx.ingress.kubernetes.io/ssl-redirect: "true"
2222
hosts:
23-
- host: "api.hankers-frontend.myaddr.tools"
23+
- host: "api.hankers.myaddr.tools"
2424
paths:
2525
- path: /socket.io
2626
pathType: Prefix
@@ -29,7 +29,7 @@ ingress:
2929
tls:
3030
- secretName: backend-tls
3131
hosts:
32-
- api.hankers-frontend.myaddr.tools
32+
- api.hankers.myaddr.tools
3333

3434
resources:
3535
limits:

frontend/deploy.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ fi
1010

1111
if [ "${ENV_TAG}" = "prod" ]; then
1212
RELEASE_NAME="hankers-frontend-prod"
13-
VALUES_FILE="values-prod.yaml"
13+
exit 1
1414
elif [ "${ENV_TAG}" = "dev" ]; then
1515
RELEASE_NAME="hankers-frontend-dev"
16-
VALUES_FILE="values-dev.yaml"
1716
else
1817
exit 1
1918
fi
@@ -48,11 +47,10 @@ az aks get-credentials \
4847
--name ${AZURE_CLUSTER_NAME} \
4948
--overwrite-existing > /dev/null 2>&1
5049

51-
helm upgrade "$RELEASE_NAME" "$SCRIPT_DIR/helm-chart" \
50+
helm upgrade hankers-frontend "$SCRIPT_DIR/helm-chart" \
5251
--install \
5352
--create-namespace \
5453
--namespace default \
55-
--values "$SCRIPT_DIR/helm-chart/${VALUES_FILE}" \
5654
--set image.tag="$IMAGE_TAG" \
5755
--set image.repository="$IMAGE_REPO" \
5856
--history-max 3 \

frontend/helm-chart/values-dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ ingress:
1717
cert-manager.io/cluster-issuer: "letsencrypt-prod"
1818
nginx.ingress.kubernetes.io/ssl-redirect: "true"
1919
hosts:
20-
- host: "hankers-frontend.myaddr.tools"
20+
- host: "hankers.myaddr.tools"
2121
paths:
2222
- path: /
2323
pathType: Prefix
2424
tls:
2525
- secretName: frontend-tls
2626
hosts:
27-
- hankers-frontend.myaddr.tools
27+
- hankers.myaddr.tools

frontend/helm-chart/values.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ replicaCount: 1
33
image:
44
repository: karimzakzouk/frontend
55
pullPolicy: Always
6-
tag: "latest"
6+
tag: "dev"
77

88
nameOverride: ""
99
fullnameOverride: ""
@@ -16,12 +16,18 @@ service:
1616
ingress:
1717
enabled: true
1818
className: nginx
19-
annotations: {}
19+
annotations:
20+
cert-manager.io/cluster-issuer: "letsencrypt-prod"
21+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
2022
hosts:
21-
- host: ""
23+
- host: "hankers.myaddr.tools"
2224
paths:
23-
- path: /frontend(/|$)(.*)
24-
pathType: ImplementationSpecific
25+
- path: /
26+
pathType: Prefix
27+
tls:
28+
- secretName: frontend-tls
29+
hosts:
30+
- hankers.myaddr.tools
2531

2632
resources:
2733
limits:
@@ -46,7 +52,8 @@ readinessProbe:
4652
periodSeconds: 5
4753

4854
env:
49-
NODE_ENV: "production"
55+
NODE_ENV: "dev"
56+
NEXT_PUBLIC_BASE_PATH: ""
5057

5158
secrets:
5259
name: hankers-frontend-secrets

infra/setup/config/monitoring/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ grafana:
6868
cert-manager.io/cluster-issuer: letsencrypt-prod
6969
nginx.ingress.kubernetes.io/ssl-redirect: "false"
7070
hosts:
71-
- hankers-grafana.myaddr.tools
71+
- grafana.hankers.myaddr.tools
7272
tls:
7373
- secretName: grafana-tls
7474
hosts:
75-
- hankers-grafana.myaddr.tools
75+
- grafana.hankers.myaddr.tools
7676

7777
alertmanager:
7878
ingress:
@@ -82,8 +82,8 @@ alertmanager:
8282
cert-manager.io/cluster-issuer: letsencrypt-prod
8383
nginx.ingress.kubernetes.io/ssl-redirect: "false"
8484
hosts:
85-
- hankers-alertmanager.myaddr.tools
85+
- alertmanager.hankers.myaddr.tools
8686
tls:
8787
- secretName: alertmanager-tls
8888
hosts:
89-
- hankers-alertmanager.myaddr.tools
89+
- alertmanager.hankers.myaddr.tools

infra/setup/scripts/install-cert-manager.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fi
2121
helm upgrade --install cert-manager jetstack/cert-manager \
2222
--namespace cert-manager \
2323
--create-namespace \
24-
--version 1.13.2 \
2524
--set installCRDs=true \
2625
--wait \
2726
--timeout=5m

infra/setup/scripts/install-ingress.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fi
2121
helm upgrade --install ingress-nginx ingress-nginx/ingress-nginx \
2222
--namespace ingress-nginx \
2323
--create-namespace \
24-
--version 4.13.3 \
2524
--values "$CONFIG_DIR/ingress/values.yaml" \
2625
--wait \
2726
--timeout=5m

infra/setup/scripts/install-logging.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ fi
2020

2121
helm upgrade --install loki grafana/loki \
2222
--namespace monitoring \
23-
--version 6.44.0 \
2423
--values "$CONFIG_DIR/logging/values.yaml" \
2524
--wait \
2625
--timeout=10m
2726

2827
# Install Promtail
2928
helm upgrade --install promtail grafana/promtail \
3029
--namespace monitoring \
31-
--version 6.17.0 \
3230
--set config.clients[0].url=http://loki-gateway/loki/api/v1/push \
3331
--wait \
3432
--timeout=3m
@@ -42,6 +40,6 @@ echo "Waiting for Loki gateway..."
4240
kubectl wait --namespace monitoring \
4341
--for=condition=ready pod \
4442
--selector=app.kubernetes.io/component=gateway \
45-
--timeout=60s || sleep 10
43+
--timeout=60s
4644

4745
echo "Logging installed"

0 commit comments

Comments
 (0)