Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions deploy/helm/shipsec/templates/dind-deployment.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions deploy/helm/shipsec/templates/dind-pvc.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions deploy/helm/shipsec/templates/dind-service.yaml

This file was deleted.

8 changes: 5 additions & 3 deletions deploy/helm/shipsec/templates/worker-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ spec:
secretKeyRef:
name: {{ .Values.secrets.name }}
key: SECRET_STORE_MASTER_KEY
- name: INTERNAL_SERVICE_TOKEN
valueFrom:
secretKeyRef:
name: {{ .Values.secrets.name }}
key: INTERNAL_SERVICE_TOKEN
Comment on lines +50 to +54

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Add INTERNAL_SERVICE_TOKEN to generated app secrets

The worker Deployment now requires INTERNAL_SERVICE_TOKEN from the app secret, but the chart’s generated secret template still only defines DATABASE_URL, MinIO keys, and SECRET_STORE_MASTER_KEY (see deploy/helm/shipsec/templates/app-secret.local.yaml). With default secrets.create: true, this leaves the key missing and causes worker pods to fail startup with a missing secret key (CreateContainerConfigError), which blocks worker execution in default installs.

Useful? React with 👍 / 👎.

{{- if eq .Values.execution.mode "k8s" }}
- name: EXECUTION_MODE
value: "k8s"
Expand All @@ -66,9 +71,6 @@ spec:
- name: K8S_JOB_SERVICE_ACCOUNT
value: {{ .Values.execution.k8s.jobServiceAccount | quote }}
{{- end }}
{{- else if .Values.execution.workerDockerHost }}
- name: DOCKER_HOST
value: {{ .Values.execution.workerDockerHost | quote }}
{{- end }}
{{- range $k, $v := .Values.worker.env }}
- name: {{ $k }}
Expand Down
11 changes: 1 addition & 10 deletions deploy/helm/shipsec/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,8 @@ ingress:
secretName: shipsec-tls

execution:
# "docker" = use Docker CLI (local dev / DIND), "k8s" = K8s Jobs (GKE / production)
# "docker" = use local Docker socket (local dev), "k8s" = K8s Jobs (GKE / production)
mode: docker
dind:
enabled: false
serviceName: shipsec-dind
namespace: shipsec-workloads
port: 2375
storage:
enabled: true
size: 20Gi
workerDockerHost: ''
k8s:
# Namespace where component Jobs are created
jobNamespace: shipsec-workloads
Expand Down
6 changes: 0 additions & 6 deletions deploy/helm/shipsec/values/cloud-generic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,3 @@ backend:
frontend:
service:
type: ClusterIP

execution:
dind:
enabled: false
workerDockerHost: ""

5 changes: 0 additions & 5 deletions deploy/helm/shipsec/values/dind.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions deploy/helm/shipsec/values/no-dind.yaml

This file was deleted.