Skip to content

Commit

Permalink
Merge pull request #59 from CircleCI-Public/sr/update-sc-example
Browse files Browse the repository at this point in the history
[ONPREM-1025] Use correct format for service container config example
  • Loading branch information
Stuart133 authored Jun 24, 2024
2 parents d8e6d2a + ec9e13d commit af248a3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
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

[#59](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/59) Fix service container config example & update test

# 101.1.1

[#56](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/56) Fix bug with service container config loading
Expand Down
10 changes: 5 additions & 5 deletions tests/configmap_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ tests:
custom.io: my-annotation
agent.serviceContainers:
exact:
- docker.io/some-repo/generic-image:a-tag:
resources:
limits:
cpu: 500m
docker.io/some-repo/generic-image:a-tag:
resources:
limits:
cpu: 500m

asserts:
- equal:
Expand All @@ -50,7 +50,7 @@ tests:
custom.io: my-annotation
serviceContainers:
exact:
- docker.io/some-repo/generic-image:a-tag:
docker.io/some-repo/generic-image:a-tag:
resources:
limits:
cpu: 500m
14 changes: 7 additions & 7 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,26 @@ agent:
# to your job's service containers. TODO: Full docs link
serviceContainers: {}
# exact:
# - docker.io/some-repo/generic-image:a-tag:
# docker.io/some-repo/generic-image:a-tag:
# resources:
# limits:
# cpu: 500m
# pattern:
# - (docker\.io)\/?my\-repo\/.*:.*:
# (docker\.io)\/?my\-repo\/.*:.*:
# resources:
# limits:
# cpu: 1
# memory: 512Mi
# prefix:
# - docker.io/their-repo/:
# docker.io/their-repo/:
# resources:
# limits:
# cpu: 250m
# default:
# resources:
# limits:
# cpu: 250m
# memory: 256Mi
# 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
Expand Down

0 comments on commit af248a3

Please sign in to comment.