Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ONPREM-64] Load service container config into pod config configmap #54

Merged
merged 1 commit into from
Jun 7, 2024
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ The command removes all the Kubernetes objects associated with the chart and del
| 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.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 |
| agent.ssh.controllerName | string | `"gateway.envoyproxy.io/gatewayclass-controller"` | The name of the [Gateway controller](https://gateway-api.sigs.k8s.io/implementations/). The rerun jobs with SSH feature relies on [Gateway API](https://gateway-api.sigs.k8s.io/) and its [TCPRoute](https://gateway-api.sigs.k8s.io/guides/tcp/) resource for SSH access, which requires additional setup of a compatible Gateway controller that supports TCP routing. CircleCI currently recommends [Envoy Gateway](https://gateway.envoyproxy.io/) as a Gateway controller for this. To set it up, [read the docs](https://circleci.com/docs/container-runner-installation/#1-install-envoy-gateway-to-your-cluster). |
| agent.ssh.enabled | bool | `false` | Enable [rerunning jobs with SSH](https://circleci.com/docs/ssh-access-jobs/). For instructions on how to set up this feature, [read the docs](https://circleci.com/docs/container-runner-installation/#enable-rerun-job-with-ssh). |
| agent.ssh.existingGatewayClassName | string | `""` | Option to use an existing GatewayClass instead of creating a new one. The GatewayClass is a cluster-scoped resource defined by the infrastructure provider, which you may wish to manage externally. Note that the configuration specific to SSH routing is defined in the namespace-scoped Gateway resource. For further information, see the [Gateway API reference](https://gateway-api.sigs.k8s.io/api-types/gatewayclass/#gatewayclass), and the documentation for the Gateway controller specified by `agent.ssh.controllerName`. |
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

[#54](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/50) Load global service container config & add example usage

# 101.1.0

- [#50](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/50) Take a list of pull secret names rather than requiring full YAML maps for agent image pull secrets
Expand Down
2 changes: 2 additions & 0 deletions templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ data:
{{- end }}
{{- end }}
{{- end }}
serviceContainers:
{{- toYaml .Values.agent.serviceContainers | nindent 6 }}:
25 changes: 25 additions & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,31 @@ agent:
# imagePullSecrets:
# - name: "other"

# -- Configuration for service containers. This allows different a different container spec to be passed
# to your job's service containers. TODO: Full docs link
serviceContainers: {}
# exact:
# - docker.io/some-repo/generic-image:a-tag:
# resources:
# limits:
# cpu: 500m
# pattern:
# - (docker\.io)\/?my\-repo\/.*:.*:
# resources:
# limits:
# cpu: 1
# memory: 512Mi
# prefix:
# - docker.io/their-repo/:
# resources:
# limits:
# cpu: 250m
# default:
# resources:
# limits:
# cpu: 250m
# memory: 256Mi

## -- Resource class constraint validation checker settings. The checker will periodically validate the
## node constraints in the resource class spec to ensure task pods can be scheduled before claiming tasks
constraintChecker:
Expand Down