Skip to content

Commit 2624282

Browse files
authored
Merge branch 'master' into docs/bump_nix-update_gen_oas
2 parents ed266c0 + 8b70d84 commit 2624282

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
command: make build-db
4545
deploy:
4646
machine:
47-
image: ubuntu-2204:2023.10.1
47+
image: ubuntu-2204:2024.11.1
4848
resource_class: large
4949
steps:
5050
- checkout

.github/workflows/docker-k8s.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- name: Lint k8s
6767
run: (cd Resources/k8s/kustomize && yamllint .)
6868
- name: Create k8s Kind Cluster
69-
uses: helm/kind-action@v1.10.0
69+
uses: helm/kind-action@v1.12.0
7070
with:
7171
cluster_name: pokeapi
7272
version: v0.21.0

Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
done;
2626
containers:
2727
- name: graphql-engine
28-
image: hasura/graphql-engine:v2.36.4
28+
image: hasura/graphql-engine:v2.45.1
2929
ports:
3030
- containerPort: 8080
3131
env:

Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: ingress-controller
1717
containers:
1818
- name: haproxy-ingress-controller
19-
image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.0
19+
image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.7
2020
resources:
2121
limits:
2222
memory: "256Mi"

Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
initContainers:
1818
- name: postgres-connection-checker
19-
image: postgres:15.1-alpine
19+
image: postgres:17.2-alpine3.21
2020
command: ['sh', '-c']
2121
args:
2222
- until pg_isready -h postgresql -p 5432; do

Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: postgresql
19-
image: postgres:15.1-alpine
19+
image: postgres:17.2-alpine3.21
2020
ports:
2121
- containerPort: 5432
2222
env:

Resources/k8s/kustomize/base/deployments/redis-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: redis
19-
image: redis:7.0.7-alpine
19+
image: redis:7.4.2-alpine3.21
2020
ports:
2121
- containerPort: 6379
2222
resources: {}

Resources/k8s/kustomize/base/jobs/load-graphql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
command: ["sh", "-c"]
3434
args:
3535
- apt-get update && apt-get install -y curl git &&
36-
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.36.4 bash &&
36+
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.45.1 bash &&
3737
cd /tmp &&
3838
git clone https://github.com/PokeAPI/pokeapi.git &&
3939
cd pokeapi &&

Resources/k8s/kustomize/local/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4-
bases:
4+
resources:
55
- ../base
66

77
images:

Resources/k8s/kustomize/staging/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4-
bases:
4+
resources:
55
- ../base
66

77
images:

0 commit comments

Comments
 (0)