From a48ec4d66586af9044b8e4476c2dc638a4da1c8c Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Nov 2025 18:12:01 +0300 Subject: [PATCH 1/3] fix: add internalInfra --- charts/cf-runtime/Chart.yaml | 12 ++++-------- charts/cf-runtime/README.md | 2 +- .../templates/runtime/runtime-env-spec-tmpl.yaml | 5 +++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml index b20c4f0e..e88fb2ac 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: 8.3.15 +version: 8.3.16 keywords: - codefresh - runner @@ -16,13 +16,9 @@ annotations: # 💡 Do not forget to update this annotation: artifacthub.io/containsSecurityUpdates: "true" # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`: - artifacthub.io/changes: | - - kind: changed - description: "Update \"engine\" to 1.180.6" - - kind: fixed - description: "Fix an issue that prevented the Docker metrics collector from shutting down gracefully" - - kind: security - description: "Security fixes in cf-debugger, cf-git-cloner, cli, dind, engine, fs-ops and kubectl" + artifacthub.io/changes: | #yaml + - kind: added + description: "Add runtimeScheduler.internalInfra field to runtime spec" 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 a3411e91..d7104afd 100644 --- a/charts/cf-runtime/README.md +++ b/charts/cf-runtime/README.md @@ -1,6 +1,6 @@ ## Codefresh Runner -![Version: 8.3.15](https://img.shields.io/badge/Version-8.3.15-informational?style=flat-square) +![Version: 8.3.16](https://img.shields.io/badge/Version-8.3.16-informational?style=flat-square) Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes. diff --git a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml index 2d218fa8..afb98d19 100644 --- a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml +++ b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml @@ -24,6 +24,11 @@ metadata: agent: {{ .Values.runtime.agent }} runtimeScheduler: type: KubernetesPod + {{- if .Values.runtime.agent }} + internalInfra: false + {{- else }} + internalInfra: true + {{- end }} {{- if $engineContext.image }} image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $engineContext.image "context" .) | squote }} {{- end }} From b200820b694f6ba53eede9c078815e80d16093eb Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 3 Nov 2025 18:36:54 +0300 Subject: [PATCH 2/3] fix: add internalInfra --- .../tests/private-registry/private_registry_test.yaml | 5 +++-- charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml | 6 ++++-- charts/cf-runtime/tests/runtime/runtime_test.yaml | 5 +++-- 3 files changed, 10 insertions(+), 6 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 fc94ee80..1e163019 100644 --- a/charts/cf-runtime/tests/private-registry/private_registry_test.yaml +++ b/charts/cf-runtime/tests/private-registry/private_registry_test.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json suite: private_registry test values: - ../values.yaml @@ -18,12 +18,13 @@ tests: asserts: - equal: path: data["my-context-codefresh.yaml"] - value: | + value: | #yaml metadata: name: my-context/codefresh agent: true runtimeScheduler: type: KubernetesPod + internalInfra: false image: 'somedomain.io/codefresh/engine:tagoverride' imagePullPolicy: IfNotPresent command: diff --git a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml index 5d6aed61..0fec0c74 100644 --- a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml +++ b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml @@ -28,12 +28,13 @@ tests: asserts: - equal: path: data["my-runtime.yaml"] - value: | + value: | #yaml metadata: name: system/my-runtime agent: false runtimeScheduler: type: KubernetesPod + internalInfra: true image: 'quay.io/codefresh/engine:tagoverride' imagePullPolicy: IfNotPresent command: @@ -248,12 +249,13 @@ tests: asserts: - equal: path: data["default-override.yaml"] - value: | + value: | #yaml metadata: name: system/default-override agent: false runtimeScheduler: type: KubernetesPod + internalInfra: true image: 'quay.io/codefresh/engine:tagoverride' imagePullPolicy: IfNotPresent command: diff --git a/charts/cf-runtime/tests/runtime/runtime_test.yaml b/charts/cf-runtime/tests/runtime/runtime_test.yaml index 93f80f90..e289acb7 100644 --- a/charts/cf-runtime/tests/runtime/runtime_test.yaml +++ b/charts/cf-runtime/tests/runtime/runtime_test.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json suite: runtime test values: - ../values.yaml @@ -30,12 +30,13 @@ tests: asserts: - equal: path: data["my-context-codefresh.yaml"] - value: | + value: | #yaml metadata: name: my-context/codefresh agent: true runtimeScheduler: type: KubernetesPod + internalInfra: false image: 'quay.io/codefresh/engine:tagoverride@sha256:123' imagePullPolicy: Always command: From 14eb11304b014b2377344c0b8d08c41bfd60532e Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 5 Nov 2025 23:08:06 +0300 Subject: [PATCH 3/3] fix: add internalInfra --- charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml index afb98d19..930112c1 100644 --- a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml +++ b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml @@ -329,4 +329,7 @@ appProxy: {{- if not .Values.runtime.agent }} systemHybrid: true {{- end }} +{{- if not .Values.runtime.agent }} +environmentCertPath: /etc/ssl/cf/ +{{- end }} {{- end }}