Skip to content
Merged
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ create.sql
shell.nix
**/.jekyll-cache
**/tmp
**/*.bak

# Helm
kubernetes/packages
Expand Down
6 changes: 4 additions & 2 deletions docs/DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,10 @@ python -m pytest tests/unit/test_utils.py
python -m pytest tests/unit/test_utils.py::TestToJson::test_serializes_dict
```

The authentication tests use Moto to emulate Cognito. Unit tests must not
require real AWS credentials or network access.
The authentication tests use Moto to emulate Cognito. ECS-spawner unit tests
use botocore's `Stubber` to validate ECS API requests and responses without AWS
credentials or network access; they do not start containers. A future
Docker-enabled LocalStack suite should cover ECS task image execution.

### UI unit tests

Expand Down
18 changes: 8 additions & 10 deletions helm/beakerhub/templates/beakerhub-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,17 @@ c.Authenticator.admin_users = {{ .Values.auth.adminUsers | toJson }}
# Task Configuration (node image import jobs, etc.)
#------------------------------------------------------------------------------

c.BeakerHub.task_namespace = {{ .Values.namespace | quote }}
c.BeakerHub.task_reporter_image = {{ printf "%s%s:%s" (default "" .Values.defaultRegistry) .Values.tasks.reporter.image.repository .Values.tasks.reporter.image.tag | quote }}
c.BeakerHub.task_reporter_pull_policy = {{ .Values.tasks.reporter.image.pullPolicy | quote }}
c.BeakerHub.task_reporter_resources = {{ .Values.tasks.reporter.resources | toJson }}
c.BeakerHub.task_node_image_resources = {{ .Values.tasks.nodeImageDefaults.resources | toJson }}
c.BeakerHub.task_backoff_limit = {{ .Values.tasks.backoffLimit }}
c.BeakerHub.task_active_deadline_seconds = {{ .Values.tasks.activeDeadlineSeconds }}
c.BeakerHub.task_ttl_seconds_after_finished = {{ .Values.tasks.ttlSecondsAfterFinished }}
c.KubernetesTaskRunnerService.namespace = {{ .Values.namespace | quote }}
c.KubernetesTaskRunnerService.node_image_resources = {{ .Values.tasks.nodeImageDefaults.resources | toJson }}
c.KubernetesTaskRunnerService.backoff_limit = {{ .Values.tasks.backoffLimit }}
c.KubernetesTaskRunnerService.active_deadline_seconds = {{ .Values.tasks.activeDeadlineSeconds }}
c.KubernetesTaskRunnerService.ttl_seconds_after_finished = {{ .Values.tasks.ttlSecondsAfterFinished }}
c.KubernetesDashboardService.namespace = {{ .Values.namespace | quote }}
{{- if .Values.tasks.nodeSelector }}
c.BeakerHub.task_node_selector = {{ .Values.tasks.nodeSelector | toJson }}
c.KubernetesTaskRunnerService.node_selector = {{ .Values.tasks.nodeSelector | toJson }}
{{- end }}
{{- if .Values.tasks.tolerations }}
c.BeakerHub.task_tolerations = {{ .Values.tasks.tolerations | toJson }}
c.KubernetesTaskRunnerService.tolerations = {{ .Values.tasks.tolerations | toJson }}
{{- end }}

{{- if .Values.config.extraConfig }}
Expand Down
2 changes: 1 addition & 1 deletion helm/beakerhub/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
"Content-Security-Policy": "frame-ancestors 'self' {{ .Values.ingress.hosts.proxy }} *.{{ .Values.ingress.hosts.proxy }}",
}
}
c.KernelProvisionerFactory.default_provisioner_name = "kubernetes-local-provisioner"
c.KernelProvisionerFactory.default_provisioner_name = "beakerhub-local-provisioner"

c.BaseBeakerApp.secrets_manager_class = "beakerhub.services.secrets.beakerhub.BeakerhubSecretsManager"
c.BeakerhubSecretsManager.policy_override_env_key_suffix = "{{ .Values.secrets.policyOverrideEnvSuffix }}"
Expand Down
Loading