Skip to content

Commit 6af669e

Browse files
mermoldymermoldy
committed
Merge branch 'SCALRCORE-35977' of github.com:Scalr/agent-helm into SCALRCORE-35910
2 parents 1b88738 + c20851c commit 6af669e

File tree

14 files changed

+96
-24
lines changed

14 files changed

+96
-24
lines changed

‎.github/workflows/dependabot-to-jira.yml‎ renamed to ‎.github/workflows/security-jira-ticket.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create Jira Tickets from Dependabot Security Alerts
1+
name: Create Jira Tickets from Security Alerts
22
permissions:
33
contents: read
44
security-events: write
@@ -26,8 +26,8 @@ jobs:
2626
path: actions
2727
ref: master
2828

29-
- name: Run Dependabot Alerts Checker
30-
uses: ./actions/dependabot-jira-ticket
29+
- name: Run Security Alerts Checker
30+
uses: ./actions/security-jira-ticket
3131
with:
3232
github_repository: ${{ github.repository }}
3333
github_token: ${{ steps.generate_token.outputs.token }}

‎charts/agent-docker/CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [UNRELEASED]
1111

12+
## [v0.5.62]
13+
14+
### Updated
15+
16+
- Bumping chart version to v0.5.62 for scalr-agent v0.55.2
17+
18+
## [v0.5.61]
19+
20+
### Updated
21+
22+
- Bumping chart version to v0.5.61 for scalr-agent v0.55.1
23+
24+
## [v0.5.60]
25+
26+
### Updated
27+
28+
- Bumping chart version to v0.5.60 for scalr-agent v0.55.0
29+
1230
## [v0.5.59]
1331

1432
### Updated

‎charts/agent-docker/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: |
55
where runs are executed in [dind](https://hub.docker.com/_/docker) sidecar container.
66
Run phases are isolated into docker containers.
77
type: application
8-
version: 0.5.59
9-
appVersion: 0.54.0
8+
version: 0.5.62
9+
appVersion: 0.55.2
1010
home: https://github.com/Scalr/agent-helm/tree/master/charts/agent-docker
1111
maintainers:
1212
- name: scalr

‎charts/agent-docker/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# agent-docker
22

3-
![Version: 0.5.59](https://img.shields.io/badge/Version-0.5.59-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
3+
![Version: 0.5.62](https://img.shields.io/badge/Version-0.5.62-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.55.2](https://img.shields.io/badge/AppVersion-0.55.2-informational?style=flat-square)
44

55
A Helm chart for the scalr-agent deployment on the Kubernetes cluster,
66
where runs are executed in [dind](https://hub.docker.com/_/docker) sidecar container.
@@ -80,4 +80,4 @@ the same Kubernetes cluster to increase overall capacity.
8080
| tolerations | list | `[]` | Tolerations for the Scalr Agent pods, allowing them to run on tainted nodes |
8181

8282
----------------------------------------------
83-
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
83+
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

‎charts/agent-job/CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [UNRELEASED]
1111

12+
## [v0.5.62]
13+
14+
### Updated
15+
16+
- Bumping chart version to v0.5.62 for scalr-agent v0.55.2
17+
18+
## [v0.5.61]
19+
20+
### Updated
21+
22+
- Bumping chart version to v0.5.61 for scalr-agent v0.55.1
23+
24+
## [v0.5.60]
25+
26+
### Updated
27+
28+
- Bumping chart version to v0.5.60 for scalr-agent v0.55.0
29+
1230
- Initial release.

‎charts/agent-job/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: |
55
Uses a controller/worker model. Each run stage is isolated
66
in Kubernetes containers with specified resource limits.
77
type: application
8-
version: 0.5.59
9-
appVersion: 0.54.0
8+
version: 0.5.62
9+
appVersion: 0.55.2
1010
home: https://github.com/Scalr/agent-helm/tree/master/charts/agent-job
1111
maintainers:
1212
- name: scalr

‎charts/agent-job/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# agent-job
22

3-
![Version: 0.5.59](https://img.shields.io/badge/Version-0.5.59-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
3+
![Version: 0.5.62](https://img.shields.io/badge/Version-0.5.62-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.55.2](https://img.shields.io/badge/AppVersion-0.55.2-informational?style=flat-square)
44

55
A Helm chart for deploying the Scalr Agent on a Kubernetes cluster.
66
Uses a controller/worker model. Each run stage is isolated
@@ -339,4 +339,4 @@ It's best to pull the logs immediately after an incident, since this command wil
339339
| task.worker.securityContext | object | `{}` | Security context for worker container (inherits from agent.securityContext if empty). |
340340

341341
----------------------------------------------
342-
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
342+
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

‎charts/agent-job/templates/task.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
securityContext:
3737
{{- toYaml . | nindent 12 }}
3838
{{- end }}
39-
containers:
39+
initContainers:
4040
- name: worker
4141
{{- $workerImage := .Values.task.worker.image }}
4242
{{- if not $workerImage.repository }}
@@ -50,6 +50,9 @@ spec:
5050
{{- end }}
5151
imagePullPolicy: {{ $workerImage.pullPolicy | default .Values.agent.image.pullPolicy }}
5252
command: ["python", "-m", "tacoagent.cmd"]
53+
# When a container in initContainers has restartPolicy: Always,
54+
# it is treated as a sidecar. Kubernetes v1.29 is required.
55+
restartPolicy: Always
5356
{{- with (default .Values.agent.securityContext .Values.task.worker.securityContext) }}
5457
securityContext:
5558
{{- toYaml . | nindent 14 }}
@@ -101,7 +104,7 @@ spec:
101104
{{- range .Values.task.sidecars }}
102105
- {{- toYaml . | nindent 12 }}
103106
{{- end }}
104-
initContainers:
107+
containers:
105108
- name: runner
106109
{{- $registry := .Values.global.imageRegistry }}
107110
{{- if $registry }}
@@ -112,9 +115,6 @@ spec:
112115
imagePullPolicy: {{ .Values.task.runner.image.pullPolicy }}
113116
command: ["/bin/sh", "/opt/scalr-agent/tacoagent/driver/exec_loop.sh"]
114117
workingDir: /opt/workdir
115-
# When a container in initContainers has restartPolicy: Always,
116-
# it is treated as a sidecar. Kubernetes v1.29 is required.
117-
restartPolicy: Always
118118
{{- with .Values.task.runner.securityContext }}
119119
securityContext:
120120
{{- toYaml . | nindent 14 }}

‎charts/agent-k8s/CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [UNRELEASED]
1111

12+
## [v0.5.61]
13+
14+
### Updated
15+
16+
- Bumping chart version to v0.5.61 for scalr-agent v0.55.2
17+
18+
## [v0.5.60]
19+
20+
### Updated
21+
22+
- Bumping chart version to v0.5.60 for scalr-agent v0.55.1
23+
24+
## [v0.5.59]
25+
26+
### Updated
27+
28+
- Bumping chart version to v0.5.59 for scalr-agent v0.55.0
29+
1230
## [v0.5.58]
1331

1432
### Updated

‎charts/agent-k8s/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: |
55
Uses a controller/worker model. Each run stage is isolated
66
in Kubernetes containers with specified resource limits.
77
type: application
8-
version: 0.5.58
9-
appVersion: 0.53.0
8+
version: 0.5.61
9+
appVersion: 0.55.2
1010
home: https://github.com/Scalr/agent-helm/tree/master/charts/agent-k8s
1111
maintainers:
1212
- name: scalr

0 commit comments

Comments
 (0)