diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6cccae0a..2bee4b541 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
command: make build-db
deploy:
machine:
- image: ubuntu-2204:2023.10.1
+ image: ubuntu-2204:2024.11.1
resource_class: large
steps:
- checkout
diff --git a/.github/workflows/docker-k8s.yml b/.github/workflows/docker-k8s.yml
index a03e3a9d8..1cfbc2d78 100644
--- a/.github/workflows/docker-k8s.yml
+++ b/.github/workflows/docker-k8s.yml
@@ -66,7 +66,7 @@ jobs:
- name: Lint k8s
run: (cd Resources/k8s/kustomize && yamllint .)
- name: Create k8s Kind Cluster
- uses: helm/kind-action@v1.10.0
+ uses: helm/kind-action@v1.12.0
with:
cluster_name: pokeapi
version: v0.21.0
diff --git a/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
index 8e2f43472..cf2b85388 100644
--- a/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
+++ b/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
@@ -25,7 +25,7 @@ spec:
done;
containers:
- name: graphql-engine
- image: hasura/graphql-engine:v2.36.4
+ image: hasura/graphql-engine:v2.45.1
ports:
- containerPort: 8080
env:
diff --git a/Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml b/Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml
index 72434ca0b..d7412121d 100644
--- a/Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml
+++ b/Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml
@@ -16,7 +16,7 @@ spec:
serviceAccountName: ingress-controller
containers:
- name: haproxy-ingress-controller
- image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.0
+ image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.7
resources:
limits:
memory: "256Mi"
diff --git a/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml b/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml
index 1bc5d5eb0..38cb2d4fc 100644
--- a/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml
+++ b/Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml
@@ -16,7 +16,7 @@ spec:
spec:
initContainers:
- name: postgres-connection-checker
- image: postgres:15.1-alpine
+ image: postgres:17.2-alpine3.21
command: ['sh', '-c']
args:
- until pg_isready -h postgresql -p 5432; do
diff --git a/Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml b/Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml
index 35c3fea53..25e2dbfde 100644
--- a/Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml
+++ b/Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml
@@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: postgresql
- image: postgres:15.1-alpine
+ image: postgres:17.2-alpine3.21
ports:
- containerPort: 5432
env:
diff --git a/Resources/k8s/kustomize/base/deployments/redis-deployment.yaml b/Resources/k8s/kustomize/base/deployments/redis-deployment.yaml
index 143f8de62..c3ba47567 100644
--- a/Resources/k8s/kustomize/base/deployments/redis-deployment.yaml
+++ b/Resources/k8s/kustomize/base/deployments/redis-deployment.yaml
@@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: redis
- image: redis:7.0.7-alpine
+ image: redis:7.4.2-alpine3.21
ports:
- containerPort: 6379
resources: {}
diff --git a/Resources/k8s/kustomize/base/jobs/load-graphql.yaml b/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
index cc43bb4d3..266aa2d18 100644
--- a/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
+++ b/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
@@ -33,7 +33,7 @@ spec:
command: ["sh", "-c"]
args:
- apt-get update && apt-get install -y curl git &&
- curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.36.4 bash &&
+ curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.45.1 bash &&
cd /tmp &&
git clone https://github.com/PokeAPI/pokeapi.git &&
cd pokeapi &&
diff --git a/Resources/k8s/kustomize/local/kustomization.yaml b/Resources/k8s/kustomize/local/kustomization.yaml
index 371b3533c..0ed3454d2 100644
--- a/Resources/k8s/kustomize/local/kustomization.yaml
+++ b/Resources/k8s/kustomize/local/kustomization.yaml
@@ -1,7 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-bases:
+resources:
- ../base
images:
diff --git a/Resources/k8s/kustomize/staging/kustomization.yaml b/Resources/k8s/kustomize/staging/kustomization.yaml
index ed12b218e..9d92cab58 100644
--- a/Resources/k8s/kustomize/staging/kustomization.yaml
+++ b/Resources/k8s/kustomize/staging/kustomization.yaml
@@ -1,7 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-bases:
+resources:
- ../base
images:
diff --git a/docker-compose.yml b/docker-compose.yml
index 229ff194d..0af797e4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
version: '2.4'
services:
cache:
- image: redis:7.2.3-alpine
+ image: redis:7.4.2-alpine3.21
volumes:
- redis_data:/data
restart: always
db:
- image: postgres:16.1
+ image: postgres:17.2-alpine3.21
environment:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
POSTGRES_USER: ${POSTGRES_USER:-ash}
@@ -40,7 +40,7 @@ services:
restart: always
web:
- image: nginx:1.25.3-alpine
+ image: nginx:1.27.3-alpine3.20
ports:
- "80:80"
- "443:443"
@@ -51,7 +51,7 @@ services:
- ./Resources/nginx/ssl:/ssl:ro
- graphql_cache:/tmp/cache
graphql-engine:
- image: hasura/graphql-engine:v2.36.4
+ image: hasura/graphql-engine:v2.45.1
ports:
- "8080:8080"
depends_on: