From 5b50ccf3af8aa49ddc7a6319ab730fdf41044bd4 Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Thu, 29 Feb 2024 13:12:29 +0300 Subject: [PATCH 1/2] fix: fix memory leak in engine --- charts/cf-runtime/Chart.yaml | 8 ++++++-- charts/cf-runtime/README.md | 10 ++++++---- charts/cf-runtime/values.yaml | 8 ++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml index 0a43646d..fc2ea511 100644 --- a/charts/cf-runtime/Chart.yaml +++ b/charts/cf-runtime/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: A Helm chart for Codefresh Runner name: cf-runtime -version: 6.3.13 +version: 6.3.14 keywords: - codefresh - runner @@ -14,8 +14,12 @@ maintainers: url: https://codefresh-io.github.io/ annotations: artifacthub.io/changes: | + - kind: changed + description: Upgrade engine to v1.169.7 + - kind: fixed + description: Fix memory leak in engine, caused by delays in container-logger - kind: added - description: Add exclude blobs option to git clone step + description: Add optional logging of outgoing HTTP requests in engine dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts diff --git a/charts/cf-runtime/README.md b/charts/cf-runtime/README.md index f9844cd7..fd246f55 100644 --- a/charts/cf-runtime/README.md +++ b/charts/cf-runtime/README.md @@ -1,6 +1,6 @@ ## Codefresh Runner -![Version: 6.3.13](https://img.shields.io/badge/Version-6.3.13-informational?style=flat-square) +![Version: 6.3.14](https://img.shields.io/badge/Version-6.3.14-informational?style=flat-square) Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes. @@ -1034,11 +1034,13 @@ Go to [https:///admin/runtime-environments/system](http | runtime.dind.userVolumeMounts | object | `{}` | Add extra volume mounts | | runtime.dind.userVolumes | object | `{}` | Add extra volumes | | runtime.dindDaemon | object | See below | DinD pod daemon config | -| 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). | +| 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). | | runtime.engine.affinity | object | `{}` | Set affinity | | runtime.engine.command | list | `["npm","run","start"]` | Set container command. | -| runtime.engine.env | object | `{}` | Set additional env vars. | -| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.5"}` | Set image. | +| runtime.engine.env | object | `{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","LOG_OUTGOING_HTTP_REQUESTS":"false"}` | Set additional env vars. | +| runtime.engine.env.CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS | string | `"1000"` | Interval to check the exec status in the container-logger | +| runtime.engine.env.LOG_OUTGOING_HTTP_REQUESTS | string | `"false"` | Enable debug-level logging of outgoing HTTP/HTTPS requests | +| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.169.7"}` | Set image. | | runtime.engine.nodeSelector | object | `{}` | Set node selector. | | runtime.engine.podAnnotations | object | `{}` | Set pod annotations. | | runtime.engine.podLabels | object | `{}` | Set pod labels. | diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml index 43f1d1bc..59509b51 100644 --- a/charts/cf-runtime/values.yaml +++ b/charts/cf-runtime/values.yaml @@ -499,7 +499,7 @@ runtime: image: registry: quay.io repository: codefresh/engine - tag: 1.169.5 + tag: 1.169.7 # -- Set container command. command: - npm @@ -530,7 +530,11 @@ runtime: CR_6177_FIXER: 'quay.io/codefresh/alpine:edge' GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:0.5.3' # -- Set additional env vars. - env: {} + env: + # -- Interval to check the exec status in the container-logger + CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000' + # -- Enable debug-level logging of outgoing HTTP/HTTPS requests + LOG_OUTGOING_HTTP_REQUESTS: 'false' # -- Set pod annotations. podAnnotations: {} # -- Set pod labels. From 2d050ddacbed0811af402dc12cc7be03959fe46c Mon Sep 17 00:00:00 2001 From: Zhenya Tikhonov Date: Thu, 29 Feb 2024 13:27:14 +0300 Subject: [PATCH 2/2] tests: add new engine env variables --- .../tests/private-registry/private_registry_test.yaml | 3 ++- charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml | 4 +++- charts/cf-runtime/tests/runtime/runtime_test.yaml | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/cf-runtime/tests/private-registry/private_registry_test.yaml b/charts/cf-runtime/tests/private-registry/private_registry_test.yaml index 59b3f9bb..3882b661 100644 --- a/charts/cf-runtime/tests/private-registry/private_registry_test.yaml +++ b/charts/cf-runtime/tests/private-registry/private_registry_test.yaml @@ -37,6 +37,8 @@ tests: - run - start envVars: + CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000" + LOG_OUTGOING_HTTP_REQUESTS: "false" COMPOSE_IMAGE: "somedomain.io/codefresh/compose:tagoverride" CONTAINER_LOGGER_IMAGE: "somedomain.io/codefresh/cf-container-logger:tagoverride" DOCKER_BUILDER_IMAGE: "somedomain.io/codefresh/cf-docker-builder:tagoverride" @@ -152,4 +154,3 @@ tests: path: spec.template.spec.containers[0].image pattern: ^somedomain.io/codefresh/.*$ template: templates/hooks/post-install/job-gencerts-dind.yaml - diff --git a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml index d19465c6..5b582c78 100644 --- a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml +++ b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml @@ -44,7 +44,9 @@ tests: - two - three envVars: + CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000" FOO: BAR + LOG_OUTGOING_HTTP_REQUESTS: "false" COMPOSE_IMAGE: "quay.io/codefresh/compose:tagoverride" CONTAINER_LOGGER_IMAGE: "quay.io/codefresh/cf-container-logger:tagoverride" DOCKER_BUILDER_IMAGE: "quay.io/codefresh/cf-docker-builder:tagoverride" @@ -151,4 +153,4 @@ tests: \[\] description: some description accounts: - - 59009117c102763beda7ce71 \ No newline at end of file + - 59009117c102763beda7ce71 diff --git a/charts/cf-runtime/tests/runtime/runtime_test.yaml b/charts/cf-runtime/tests/runtime/runtime_test.yaml index 8cca9aab..05c5cf5c 100644 --- a/charts/cf-runtime/tests/runtime/runtime_test.yaml +++ b/charts/cf-runtime/tests/runtime/runtime_test.yaml @@ -45,7 +45,9 @@ tests: - two - three envVars: + CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: "1000" FOO: BAR + LOG_OUTGOING_HTTP_REQUESTS: "false" COMPOSE_IMAGE: "quay.io/codefresh/compose:tagoverride" CONTAINER_LOGGER_IMAGE: "quay.io/codefresh/cf-container-logger:tagoverride" DOCKER_BUILDER_IMAGE: "quay.io/codefresh/cf-docker-builder:tagoverride" @@ -152,4 +154,4 @@ tests: extends: - system/default/hybrid/k8s_low_limits description: null - accountId: 7890 \ No newline at end of file + accountId: 7890