Skip to content

Commit a249e41

Browse files
bettercleverclaude
andcommitted
chore(deploy): remove DIND — all execution now via K8s Jobs
Docker-in-Docker is no longer needed since the K8s Job runner handles all component container execution natively. - Delete dind-deployment.yaml, dind-pvc.yaml, dind-service.yaml - Delete values/dind.yaml and values/no-dind.yaml - Remove execution.dind and workerDockerHost from values.yaml - Remove execution.dind block from values/cloud-generic.yaml - Remove workerDockerHost DOCKER_HOST env branch from worker-deployment.yaml Closes ENG-209 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> Signed-off-by: betterclever <paliwal.pranjal83@gmail.com>
1 parent 7785259 commit a249e41

8 files changed

Lines changed: 6 additions & 114 deletions

File tree

deploy/helm/shipsec/templates/dind-deployment.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

deploy/helm/shipsec/templates/dind-pvc.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

deploy/helm/shipsec/templates/dind-service.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

deploy/helm/shipsec/templates/worker-deployment.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ spec:
4747
secretKeyRef:
4848
name: {{ .Values.secrets.name }}
4949
key: SECRET_STORE_MASTER_KEY
50+
- name: INTERNAL_SERVICE_TOKEN
51+
valueFrom:
52+
secretKeyRef:
53+
name: {{ .Values.secrets.name }}
54+
key: INTERNAL_SERVICE_TOKEN
5055
{{- if eq .Values.execution.mode "k8s" }}
5156
- name: EXECUTION_MODE
5257
value: "k8s"
@@ -66,9 +71,6 @@ spec:
6671
- name: K8S_JOB_SERVICE_ACCOUNT
6772
value: {{ .Values.execution.k8s.jobServiceAccount | quote }}
6873
{{- end }}
69-
{{- else if .Values.execution.workerDockerHost }}
70-
- name: DOCKER_HOST
71-
value: {{ .Values.execution.workerDockerHost | quote }}
7274
{{- end }}
7375
{{- range $k, $v := .Values.worker.env }}
7476
- name: {{ $k }}

deploy/helm/shipsec/values.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,8 @@ ingress:
107107
secretName: shipsec-tls
108108

109109
execution:
110-
# "docker" = use Docker CLI (local dev / DIND), "k8s" = K8s Jobs (GKE / production)
110+
# "docker" = use local Docker socket (local dev), "k8s" = K8s Jobs (GKE / production)
111111
mode: docker
112-
dind:
113-
enabled: false
114-
serviceName: shipsec-dind
115-
namespace: shipsec-workloads
116-
port: 2375
117-
storage:
118-
enabled: true
119-
size: 20Gi
120-
workerDockerHost: ''
121112
k8s:
122113
# Namespace where component Jobs are created
123114
jobNamespace: shipsec-workloads

deploy/helm/shipsec/values/cloud-generic.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,3 @@ backend:
88
frontend:
99
service:
1010
type: ClusterIP
11-
12-
execution:
13-
dind:
14-
enabled: false
15-
workerDockerHost: ""
16-

deploy/helm/shipsec/values/dind.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

deploy/helm/shipsec/values/no-dind.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)