Skip to content
Open
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ The command removes all the Kubernetes objects associated with the chart and del
| agent.readinessProbe.successThreshold | int | `1` | |
| agent.readinessProbe.timeoutSeconds | int | `1` | |
| agent.replicaCount | int | `1` | |
| agent.resourceClasses | object | `{}` | Resource class settings. The tokens specified here will be used to claim tasks & the tasks will be launched with the configured configs Ref: https://circleci.com/docs/container-runner/#resource-class-configuration-custom-pod |
| agent.resourceClasses | object | `{}` | Resource class settings. The tokens specified here will be used to claim tasks & the tasks will be launched with the configured configs If you leave this unset you must provide your own configmap named {{ include "container-agent.fullname" . }} Ref: https://circleci.com/docs/container-runner/#resource-class-configuration-custom-pod |
| agent.resources | object | `{}` | Agent pod resource configuration Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
| agent.runnerAPI | string | `"https://runner.circleci.com"` | CircleCI Runner API URL |
| agent.serviceContainers | object | `{}` | Configuration for service containers. This allows different a different container spec to be passed to your job's service containers. TODO: Full docs link |
Expand Down
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# Edge

[#81](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/81) Don't render ConfigMap if `agent.resourceClasses` is unset. This allows you to template your own configmap.

[#71](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/71) Added an option to configure the image name for the orchestrator container, enabling hosting in a private registry or an air-gapped environment on CircleCI server. See the [runner-init repository](https://github.com/circleci/runner-init) for more information.

[#68](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/68) Refactor: Move `logging` container-related resources to their own component subdirectory. This is to work towards a more organized Chart.
Expand Down
2 changes: 2 additions & 0 deletions templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.agent.resourceClasses }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -18,3 +19,4 @@ data:
serviceContainers:
{{- toYaml .Values.agent.serviceContainers | nindent 6 }}
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions tests/configmap_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,9 @@ tests:
resources:
limits:
cpu: 500m
- it: should be empty when no resourceClasses are set
set:
agent.resourceClasses: {}
asserts:
- hasDocuments:
count: 0
1 change: 1 addition & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ agent:

# -- Resource class settings. The tokens specified here will be used to claim tasks & the tasks
# will be launched with the configured configs
# If you leave this unset you must provide your own configmap named {{ include "container-agent.fullname" . }}
# Ref: https://circleci.com/docs/container-runner/#resource-class-configuration-custom-pod
resourceClasses: {}
# circleci-runner/resourceClass:
Expand Down