Skip to content

Commit

Permalink
Merge pull request #47 from CircleCI-Public/sr/fix-volume-env-var
Browse files Browse the repository at this point in the history
[ONPREM-1075] Use correct env var for task volume and update changelog with unreleased changes
  • Loading branch information
Stuart133 authored May 9, 2024
2 parents 56afdca + ff8c0e2 commit 8daa46e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
resource_class: medium
steps:
- checkout
- run: ./do check-version-bump
- run: helm lint
- run: helm template --debug .
- run: ./do unit-tests
Expand Down Expand Up @@ -82,6 +81,7 @@ jobs:
- checkout
- attach_workspace:
at: .
- run: ./do check-version-bump
- run: gem install --no-document package_cloud
- run: ./do publish
- notify_slack:
Expand Down
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ description: For deploying a CircleCI Container Agent
icon: https://raw.githubusercontent.com/circleci/media/master/logo/build/horizontal_dark.1.png
type: application

version: "101.0.24"
version: "101.0.22"
appVersion: "3"
kubeVersion: ">= 1.25"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

For deploying a CircleCI Container Agent

![Version: 101.0.24](https://img.shields.io/badge/Version-101.0.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3](https://img.shields.io/badge/AppVersion-3-informational?style=flat-square)
![Version: 101.0.22](https://img.shields.io/badge/Version-101.0.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3](https://img.shields.io/badge/AppVersion-3-informational?style=flat-square)

## Contributing

Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Container Agent Helm Chart Changelog

# Edge

# 101.0.22

- [#47](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/47) [EXPERIMENTAL] Set correct env var for shared task volume
- [#44](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/44) [EXPERIMENTAL] Add toggle for shared task volume
- [#45](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/45) Set minimum kubeVersion in Chart.yaml

This is the Container Agent Helm Chart changelog
# 101.0.21
- [#42](https://github.com/CircleCI-Public/container-runner-helm-chart/pull/42) Fix formatting bug when adding role and logging role rules
Expand Down
2 changes: 1 addition & 1 deletion templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
- name: KUBE_AUTODETECT_PLATFORM
value: {{ .Values.agent.autodetectPlatform | quote }}
{{- if .Values.agent.taskVolume.enabled }}
- name: KUBE_SHARED_TASK_AGENT_VOLUME
- name: KUBE_SHARED_TASK_VOLUME
value: {{ include "container-agent.fullname" . }}
{{- end }}
{{- with .Values.agent }}
Expand Down
2 changes: 1 addition & 1 deletion tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
name: KUBE_SHARED_TASK_AGENT_VOLUME
name: KUBE_SHARED_TASK_VOLUME
value: RELEASE-NAME-container-agent
- equal:
path: spec.template.spec.securityContext
Expand Down

0 comments on commit 8daa46e

Please sign in to comment.