chore: changing versions
This commit is contained in:
parent
fece4f63bf
commit
065eb4c72f
5 changed files with 24 additions and 13 deletions
2
Makefile
2
Makefile
|
|
@ -8,7 +8,7 @@ HELM ?= helm
|
||||||
HELM_CHART := deploy/helm/go-guess
|
HELM_CHART := deploy/helm/go-guess
|
||||||
HELM_RELEASE ?= go-guess
|
HELM_RELEASE ?= go-guess
|
||||||
HELM_NAMESPACE ?= go-guess
|
HELM_NAMESPACE ?= go-guess
|
||||||
KUBECONFIG ?= $(HOME)/.config/kubectl/rancher.urpi.local.yaml
|
KUBECONFIG ?= $(HOME)/.config/kubectl/rancher.urpi.be.yaml
|
||||||
|
|
||||||
.PHONY: help dev db-up db-down migrate migrate-down seed backend frontend frontend-install test test-backend test-frontend test-integration test-bdd test-bdd-down test-env test-env-down lint build rancher-storage helm-lint helm-deploy-development helm-deploy-production
|
.PHONY: help dev db-up db-down migrate migrate-down seed backend frontend frontend-install test test-backend test-frontend test-integration test-bdd test-bdd-down test-env test-env-down lint build rancher-storage helm-lint helm-deploy-development helm-deploy-production
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,23 +46,33 @@ spec:
|
||||||
- name: amqp
|
- name: amqp
|
||||||
containerPort: 5672
|
containerPort: 5672
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- rabbitmq-diagnostics
|
||||||
|
- -q
|
||||||
|
- ping
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 10
|
||||||
|
failureThreshold: 6
|
||||||
|
startupProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
- rabbitmq-diagnostics
|
- rabbitmq-diagnostics
|
||||||
- -q
|
- -q
|
||||||
- ping
|
- ping
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 10
|
||||||
periodSeconds: 5
|
periodSeconds: 10
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 10
|
||||||
|
failureThreshold: 30
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
- rabbitmq-diagnostics
|
- rabbitmq-diagnostics
|
||||||
- -q
|
- -q
|
||||||
- ping
|
- ping
|
||||||
initialDelaySeconds: 30
|
periodSeconds: 20
|
||||||
periodSeconds: 10
|
timeoutSeconds: 10
|
||||||
timeoutSeconds: 5
|
failureThreshold: 3
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.rabbitmq.resources | nindent 12 }}
|
{{- toYaml .Values.rabbitmq.resources | nindent 12 }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,10 @@ to return the dedicated server address before requesting a certificate.
|
||||||
|
|
||||||
## Nginx and Certbot
|
## Nginx and Certbot
|
||||||
|
|
||||||
The included virtual host assumes Nginx runs on the Kubernetes node and can
|
The included virtual host assumes Rancher runs in Docker on the Nginx server.
|
||||||
reach the NodePort at `127.0.0.1:31374`.
|
It reaches the embedded K3s NodePort through Rancher's Docker bridge address,
|
||||||
|
`172.17.0.2:31374`. Confirm that address with `docker inspect rancher` before
|
||||||
|
installing the configuration.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo install -m 0644 deploy/nginx/goguess.urpi.be.conf \
|
sudo install -m 0644 deploy/nginx/goguess.urpi.be.conf \
|
||||||
|
|
@ -35,9 +37,8 @@ sudo certbot renew --dry-run
|
||||||
Certbot adds the HTTPS listener, certificate paths, and HTTP-to-HTTPS redirect
|
Certbot adds the HTTPS listener, certificate paths, and HTTP-to-HTTPS redirect
|
||||||
to this virtual host. Allow inbound TCP ports `80` and `443`. Do not expose
|
to this virtual host. Allow inbound TCP ports `80` and `443`. Do not expose
|
||||||
NodePort `31374`, PostgreSQL `5432`, RabbitMQ `5672`, or RabbitMQ management
|
NodePort `31374`, PostgreSQL `5432`, RabbitMQ `5672`, or RabbitMQ management
|
||||||
ports to the public internet. If Nginx is not on a Kubernetes node, replace
|
ports to the public internet. If Rancher uses a different Docker address,
|
||||||
`127.0.0.1` in `proxy_pass` with a private cluster-node address and allow
|
replace `172.17.0.2` in `proxy_pass` with the current Rancher container address.
|
||||||
`31374` only from the Nginx server.
|
|
||||||
|
|
||||||
## Deploy and verify
|
## Deploy and verify
|
||||||
|
|
||||||
|
|
@ -47,7 +48,7 @@ Deploy the production profile:
|
||||||
make helm-deploy-production
|
make helm-deploy-production
|
||||||
kubectl -n go-guess-production get pods
|
kubectl -n go-guess-production get pods
|
||||||
kubectl -n go-guess-production get service go-guess
|
kubectl -n go-guess-production get service go-guess
|
||||||
curl --fail http://127.0.0.1:31374/api/health
|
curl --fail http://172.17.0.2:31374/api/health
|
||||||
curl --fail https://goguess.urpi.be/api/health
|
curl --fail https://goguess.urpi.be/api/health
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ server {
|
||||||
client_max_body_size 10m;
|
client_max_body_size 10m;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:31374;
|
proxy_pass http://172.17.0.2:31374;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue