fixed Create proxy and websocket configuration configmap for wrongsecrets-balancer #252

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
         exclude: ^(helm/wrongsecrets-ctf-party/templates/|helm/test.tmp.yaml|azure/k8s/)
@@ -12,7 +12,7 @@ repos:
         exclude: ^(src/test/resources/yourkey.txt|src/test/resources/secondkey.txt)
       - id: trailing-whitespace
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.71.0
+    rev: v1.96.2
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
@@ -32,7 +32,7 @@ repos:
           - "--args=--only=terraform_workspace_remote"
       - id: terraform_docs
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.2.0
+    rev: v1.14.2
     hooks:
       - id: helm-docs
         args:
@@ -46,7 +46,7 @@ repos:
           # A base filename makes it relative to each chart directory found
           - --template-files=README.md.gotmpl
   - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-    rev: v9.4.0
+    rev: v9.18.0
     hooks:
       - id: commitlint
         stages: [commit-msg]

aws/README.md

@@ -137,7 +137,7 @@ Note that you might have to do some manual cleanups after that.
 
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -240,4 +240,4 @@ The documentation below is auto-generated to give insight on what's created via
 | <a name="output_load_balancer_controller_role_arn"></a> [load\_balancer\_controller\_role\_arn](#output\_load\_balancer\_controller\_role\_arn) | Load balancer controller role arn |
 | <a name="output_secrets_manager_secret_name"></a> [secrets\_manager\_secret\_name](#output\_secrets\_manager\_secret\_name) | The name of the secrets manager secret |
 | <a name="output_state_bucket_name"></a> [state\_bucket\_name](#output\_state\_bucket\_name) | Terraform s3 state bucket name |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

aws/shared-state/README.md

@@ -1,7 +1,7 @@
 # Terraform documentation
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -38,4 +38,4 @@ No modules.
 |------|-------------|
 | <a name="output_s3_bucket_arn"></a> [s3\_bucket\_arn](#output\_s3\_bucket\_arn) | Name of the terraform state bucket |
 | <a name="output_s3_bucket_name"></a> [s3\_bucket\_name](#output\_s3\_bucket\_name) | Name of the terraform state bucket |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

azure/README.md

@@ -145,7 +145,7 @@ Note that you might have to do some manual cleanups after that.
 
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -213,4 +213,4 @@ No modules.
 | <a name="output_tenant_id"></a> [tenant\_id](#output\_tenant\_id) | Azure tenant ID |
 | <a name="output_vault_name"></a> [vault\_name](#output\_vault\_name) | Vault name |
 | <a name="output_vault_uri"></a> [vault\_uri](#output\_vault\_uri) | Vault URI |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

azure/shared-state/README.md

@@ -1,7 +1,7 @@
 # Terraform documentation
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -42,4 +42,4 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_storage_account_name"></a> [storage\_account\_name](#output\_storage\_account\_name) | The generated storage account name |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

gcp/README.md

@@ -136,7 +136,7 @@ Note that you might have to do some manual cleanups after that.
 
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -203,4 +203,4 @@ No modules.
 | <a name="output_kubernetes_cluster_name"></a> [kubernetes\_cluster\_name](#output\_kubernetes\_cluster\_name) | GKE Cluster Name |
 | <a name="output_project_id"></a> [project\_id](#output\_project\_id) | GCloud Project ID |
 | <a name="output_region"></a> [region](#output\_region) | GCloud Region |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

gcp/shared-state/README.md

@@ -1,7 +1,7 @@
 # Terraform documentation
 The documentation below is auto-generated to give insight on what's created via Terraform.
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 | Name | Version |
@@ -40,4 +40,4 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_bucket"></a> [bucket](#output\_bucket) | Terraform backend storage bucket |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/config-map.yaml

@@ -34,5 +34,32 @@ data:
         "affinity": {{ .Values.wrongsecrets.affinity | toJson }},
         "tolerations": {{ .Values.wrongsecrets.tolerations | toJson }},
         "runtimeClassName": {{ .Values.wrongsecrets.runtimeClassName | toJson }}
+      },
+      "websocket": {
+        "servicename1:8080": [
+          "incomingurl1",
+          "incomingurl2",
+          "incomingurl3"
+        ],
+        "serviname2:3000": [
+          "incomingurl4",
+          "incomingurl5"
+        ]
+      },
+      "proxy": {
+        "servicename1:8080": [
+          "incomingurl6",
+          "incomingurl7"
+        ],
+        "servicename2:3000": [
+          "incomingurl8withwildcard"
+        ],
+        "servicename3(CTFD)": [
+          "incomingurl9",
+          "incomingurl10"
+        ],
+        "servicename4(grafana)": [
+          "incomingurl10"
+        ]
       }
     }

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/deployment.yaml

@@ -62,15 +62,17 @@ spec:
           securityContext:
             {{- omit .Values.balancer.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
-          {{- if .Values.balancer.volumeMounts }}
           volumeMounts:
-            {{- toYaml .Values.balancer.volumeMounts | nindent 12 }}
-          {{- end }}
+            - name: proxy-config
+              mountPath: /etc/config
           resources:
             {{- toYaml .Values.balancer.resources | nindent 12 }}
+          volumes:
+            - name: proxy-config
+              configMap:
+                name: proxy-config
       {{- if .Values.balancer.volumes }}
-      volumes:
-        {{- toYaml .Values.balancer.volumes | nindent 8 }}
+      {{- toYaml .Values.balancer.volumes | nindent 8 }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

helm/wrongsecrets-ctf-party/templates/wrongsecrets-balancer/proxy-config.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: proxy-config
+data:
+  # Example, adjust according to your needs
+  websocket: |
+    servicename1:8080:
+      incomingurl1
+      incomingurl2
+      incomingurl3
+    servicename2:3000
+      incomingurl4
+      incomingurl5
+  proxy: |
+    servicename1:8080:
+      incomingurl6
+      incomingurl7
+    servicename2:3000:
+      incomingurl8withwildcard
+    servicename3(CTFD):
+      incomingurl9
+      incomingurl10
+    servicename4(grafana):
+      incomingurl11

wrongsecrets-balancer/src/proxy/proxy-config.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: proxy-config
+data:
+  proxy-config.yaml: |
+    websocket:
+      servicename1:8080:
+        - /guaclite
+        - /files/socket.io/
+      servicename2:3000:
+        - /another-path
+    proxy:
+      servicename1:8080:
+        - /path1
+        - /path2
+      servicename2:3000:
+        - /another-path