Skip to content

Commit 6f68c47

Browse files
committed
Merge branch 'feat--add-gcp-support' of github.com:osamamagdy/wrongsecrets-ctf-party into feat--add-gcp-support
Signed-off-by: osamamagdy <[email protected]>
2 parents f415017 + c2d28e3 commit 6f68c47

21 files changed

+3460
-2624
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
# Initializes the CodeQL tools for scanning.
4242
- name: Initialize CodeQL

.github/workflows/minikube-k8s-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
# Steps represent a sequence of tasks that will be executed as part of the job
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Start minikube
2424
uses: medyagh/setup-minikube@master
2525
with:

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
ref: gh-pages
3636
- name: Setup Pages

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout git repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Setup python
2424
uses: actions/setup-python@v4
2525
with:

.github/workflows/publish.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: "Package Helm Chart"
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Configure Git
1414
run: |
1515
git config user.name "$GITHUB_ACTOR"
@@ -38,7 +38,7 @@ jobs:
3838
helm-docs -t helm/wrongsecrets-ctf-party/README.md.gotmpl -t helm/wrongsecrets-ctf-party/_template.gotmpl -o README.md
3939
cp helm/wrongsecrets-ctf-party/README.md /tmp/README.md
4040
- name: Update gh-pages branch
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242
with:
4343
ref: gh-pages
4444
fetch-depth: 0
@@ -56,7 +56,7 @@ jobs:
5656
git push
5757
fi
5858
- name: Get back to original branch
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060
- name: Run chart-releaser
6161
uses: helm/[email protected]
6262
with:
@@ -73,29 +73,29 @@ jobs:
7373
- wrongsecrets-balancer
7474
steps:
7575
- name: Checkout
76-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
7777

7878
- name: Docker Meta
7979
id: docker_meta
80-
uses: docker/metadata-action@v4
80+
uses: docker/metadata-action@v5
8181
with:
8282
images: iteratec/${{ matrix.component }}
8383
tags: |
8484
type=semver,pattern={{raw}}
8585
8686
- name: Set up QEMU
87-
uses: docker/setup-qemu-action@v2
87+
uses: docker/setup-qemu-action@v3
8888
- name: Set up Docker Buildx
89-
uses: docker/setup-buildx-action@v2
89+
uses: docker/setup-buildx-action@v3
9090

9191
- name: Login to DockerHub
92-
uses: docker/login-action@v2
92+
uses: docker/login-action@v3
9393
with:
9494
username: ${{ secrets.DOCKER_USERNAME }}
9595
password: ${{ secrets.DOCKER_PASSWORD }}
9696

9797
- name: Build and Push
98-
uses: docker/build-push-action@v4
98+
uses: docker/build-push-action@v5
9999
with:
100100
context: ./${{ matrix.component }}
101101
file: ./${{ matrix.component }}/Dockerfile

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Cleaner
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- uses: actions/setup-node@v3
1212
with:
1313
node-version: 18
@@ -27,7 +27,7 @@ jobs:
2727
name: Balancer
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- uses: actions/setup-node@v3
3232
with:
3333
node-version: 18

aws/.terraform.lock.hcl

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aws/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,18 @@ The documentation below is auto-generated to give insight on what's created via
146146

147147
| Name | Version |
148148
|------|---------|
149-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.10.0 |
149+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.15.0 |
150150
| <a name="provider_http"></a> [http](#provider\_http) | 3.4.0 |
151151
| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
152152

153153
## Modules
154154

155155
| Name | Source | Version |
156156
|------|--------|---------|
157-
| <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.28.0 |
158-
| <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.28.0 |
159-
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.15.4 |
160-
| <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.28.0 |
157+
| <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.30.0 |
158+
| <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.30.0 |
159+
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.16.0 |
160+
| <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.30.0 |
161161
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.1.1 |
162162

163163
## Resources

aws/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "vpc" {
6262

6363
module "eks" {
6464
source = "terraform-aws-modules/eks/aws"
65-
version = "19.15.4"
65+
version = "19.16.0"
6666

6767
cluster_name = var.cluster_name
6868
cluster_version = var.cluster_version
@@ -142,7 +142,7 @@ module "eks" {
142142
# Cluster Autoscaler IRSA
143143
module "cluster_autoscaler_irsa_role" {
144144
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
145-
version = "~> 5.28.0"
145+
version = "~> 5.30.0"
146146

147147

148148
role_name = "wrongsecrets-cluster-autoscaler"
@@ -159,7 +159,7 @@ module "cluster_autoscaler_irsa_role" {
159159

160160
module "ebs_csi_irsa_role" {
161161
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
162-
version = "~> 5.28.0"
162+
version = "~> 5.30.0"
163163

164164
role_name = "wrongsecrets-ebs-csi"
165165
attach_ebs_csi_policy = true
@@ -174,7 +174,7 @@ module "ebs_csi_irsa_role" {
174174

175175
module "load_balancer_controller_irsa_role" {
176176
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
177-
version = "~> 5.28.0"
177+
version = "~> 5.30.0"
178178

179179
role_name = "wrongsecrets-load-balancer-controller"
180180
attach_load_balancer_controller_policy = true

cleaner/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM node:18-alpine as build
1+
FROM node:20-alpine as build
22
RUN mkdir -p /home/app
33
WORKDIR /home/app
44
COPY package.json package-lock.json ./
55
RUN npm ci --omit=dev
66

7-
FROM node:18-alpine
7+
FROM node:20-alpine
88
RUN addgroup --system --gid 1001 app && adduser app --system --uid 1001 --ingroup app
99
WORKDIR /home/app/
1010
COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/

0 commit comments

Comments
 (0)