Skip to content

Commit 6497400

Browse files
author
Zhenya Tikhonov
authored
fix: fix memory leak in engine (#444)
1 parent bc4665b commit 6497400

File tree

6 files changed

+26
-11
lines changed

6 files changed

+26
-11
lines changed

charts/cf-runtime/Chart.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
description: A Helm chart for Codefresh Runner
33
name: cf-runtime
4-
version: 6.3.13
4+
version: 6.3.14
55
keywords:
66
- codefresh
77
- runner
@@ -14,8 +14,12 @@ maintainers:
1414
url: https://codefresh-io.github.io/
1515
annotations:
1616
artifacthub.io/changes: |
17+
- kind: changed
18+
description: Upgrade engine to v1.169.7
19+
- kind: fixed
20+
description: Fix memory leak in engine, caused by delays in container-logger
1721
- kind: added
18-
description: Add exclude blobs option to git clone step
22+
description: Add optional logging of outgoing HTTP requests in engine
1923
dependencies:
2024
- name: cf-common
2125
repository: oci://quay.io/codefresh/charts

charts/cf-runtime/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Codefresh Runner
22

3-
![Version: 6.3.13](https://img.shields.io/badge/Version-6.3.13-informational?style=flat-square)
3+
![Version: 6.3.14](https://img.shields.io/badge/Version-6.3.14-informational?style=flat-square)
44

55
Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
66

@@ -1034,11 +1034,13 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
10341034
| runtime.dind.userVolumeMounts | object | `{}` | Add extra volume mounts |
10351035
| runtime.dind.userVolumes | object | `{}` | Add extra volumes |
10361036
| runtime.dindDaemon | object | See below | DinD pod daemon config |
1037-
| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{},"image":{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.5"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"resources":{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"runtimeImages":{"COMPOSE_IMAGE":"quay.io/codefresh/compose:v2.20.3-1.4.0","CONTAINER_LOGGER_IMAGE":"quay.io/codefresh/cf-container-logger:1.10.3","CR_6177_FIXER":"quay.io/codefresh/alpine:edge","DOCKER_BUILDER_IMAGE":"quay.io/codefresh/cf-docker-builder:1.3.11","DOCKER_PULLER_IMAGE":"quay.io/codefresh/cf-docker-puller:8.0.16","DOCKER_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-pusher:6.0.15","DOCKER_TAG_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-tag-pusher:1.3.13","FS_OPS_IMAGE":"quay.io/codefresh/fs-ops:1.2.3","GC_BUILDER_IMAGE":"quay.io/codefresh/cf-gc-builder:0.5.3","GIT_CLONE_IMAGE":"quay.io/codefresh/cf-git-cloner:10.1.26","KUBE_DEPLOY":"quay.io/codefresh/cf-deploy-kubernetes:16.1.11","PIPELINE_DEBUGGER_IMAGE":"quay.io/codefresh/cf-debugger:1.3.0","TEMPLATE_ENGINE":"quay.io/codefresh/pikolo:0.14.0"},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userEnvVars":[]}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
1037+
| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","LOG_OUTGOING_HTTP_REQUESTS":"false"},"image":{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.7"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"resources":{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"runtimeImages":{"COMPOSE_IMAGE":"quay.io/codefresh/compose:v2.20.3-1.4.0","CONTAINER_LOGGER_IMAGE":"quay.io/codefresh/cf-container-logger:1.10.3","CR_6177_FIXER":"quay.io/codefresh/alpine:edge","DOCKER_BUILDER_IMAGE":"quay.io/codefresh/cf-docker-builder:1.3.11","DOCKER_PULLER_IMAGE":"quay.io/codefresh/cf-docker-puller:8.0.16","DOCKER_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-pusher:6.0.15","DOCKER_TAG_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-tag-pusher:1.3.13","FS_OPS_IMAGE":"quay.io/codefresh/fs-ops:1.2.3","GC_BUILDER_IMAGE":"quay.io/codefresh/cf-gc-builder:0.5.3","GIT_CLONE_IMAGE":"quay.io/codefresh/cf-git-cloner:10.1.26","KUBE_DEPLOY":"quay.io/codefresh/cf-deploy-kubernetes:16.1.11","PIPELINE_DEBUGGER_IMAGE":"quay.io/codefresh/cf-debugger:1.3.0","TEMPLATE_ENGINE":"quay.io/codefresh/pikolo:0.14.0"},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userEnvVars":[]}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
10381038
| runtime.engine.affinity | object | `{}` | Set affinity |
10391039
| runtime.engine.command | list | `["npm","run","start"]` | Set container command. |
1040-
| runtime.engine.env | object | `{}` | Set additional env vars. |
1041-
| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.5"}` | Set image. |
1040+
| runtime.engine.env | object | `{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","LOG_OUTGOING_HTTP_REQUESTS":"false"}` | Set additional env vars. |
1041+
| runtime.engine.env.CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS | string | `"1000"` | Interval to check the exec status in the container-logger |
1042+
| runtime.engine.env.LOG_OUTGOING_HTTP_REQUESTS | string | `"false"` | Enable debug-level logging of outgoing HTTP/HTTPS requests |
1043+
| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.7"}` | Set image. |
10421044
| runtime.engine.nodeSelector | object | `{}` | Set node selector. |
10431045
| runtime.engine.podAnnotations | object | `{}` | Set pod annotations. |
10441046
| runtime.engine.podLabels | object | `{}` | Set pod labels. |

charts/cf-runtime/tests/private-registry/private_registry_test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ tests:
3737
- run
3838
- start
3939
envVars:
40+
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000"
41+
LOG_OUTGOING_HTTP_REQUESTS: "false"
4042
COMPOSE_IMAGE: "somedomain.io/codefresh/compose:tagoverride"
4143
CONTAINER_LOGGER_IMAGE: "somedomain.io/codefresh/cf-container-logger:tagoverride"
4244
DOCKER_BUILDER_IMAGE: "somedomain.io/codefresh/cf-docker-builder:tagoverride"
@@ -152,4 +154,3 @@ tests:
152154
path: spec.template.spec.containers[0].image
153155
pattern: ^somedomain.io/codefresh/.*$
154156
template: templates/hooks/post-install/job-gencerts-dind.yaml
155-

charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ tests:
4444
- two
4545
- three
4646
envVars:
47+
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000"
4748
FOO: BAR
49+
LOG_OUTGOING_HTTP_REQUESTS: "false"
4850
COMPOSE_IMAGE: "quay.io/codefresh/compose:tagoverride"
4951
CONTAINER_LOGGER_IMAGE: "quay.io/codefresh/cf-container-logger:tagoverride"
5052
DOCKER_BUILDER_IMAGE: "quay.io/codefresh/cf-docker-builder:tagoverride"
@@ -151,4 +153,4 @@ tests:
151153
\[\]
152154
description: some description
153155
accounts:
154-
- 59009117c102763beda7ce71
156+
- 59009117c102763beda7ce71

charts/cf-runtime/tests/runtime/runtime_test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ tests:
4545
- two
4646
- three
4747
envVars:
48+
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000"
4849
FOO: BAR
50+
LOG_OUTGOING_HTTP_REQUESTS: "false"
4951
COMPOSE_IMAGE: "quay.io/codefresh/compose:tagoverride"
5052
CONTAINER_LOGGER_IMAGE: "quay.io/codefresh/cf-container-logger:tagoverride"
5153
DOCKER_BUILDER_IMAGE: "quay.io/codefresh/cf-docker-builder:tagoverride"
@@ -152,4 +154,4 @@ tests:
152154
extends:
153155
- system/default/hybrid/k8s_low_limits
154156
description: null
155-
accountId: 7890
157+
accountId: 7890

charts/cf-runtime/values.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ runtime:
499499
image:
500500
registry: quay.io
501501
repository: codefresh/engine
502-
tag: 1.169.5
502+
tag: 1.169.7
503503
# -- Set container command.
504504
command:
505505
- npm
@@ -530,7 +530,11 @@ runtime:
530530
CR_6177_FIXER: 'quay.io/codefresh/alpine:edge'
531531
GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:0.5.3'
532532
# -- Set additional env vars.
533-
env: {}
533+
env:
534+
# -- Interval to check the exec status in the container-logger
535+
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
536+
# -- Enable debug-level logging of outgoing HTTP/HTTPS requests
537+
LOG_OUTGOING_HTTP_REQUESTS: 'false'
534538
# -- Set pod annotations.
535539
podAnnotations: {}
536540
# -- Set pod labels.

0 commit comments

Comments
 (0)