Skip to content

Commit 656f89f

Browse files
feat(dind/engine): add pull policy (#467)
1 parent 76f56af commit 656f89f

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed

charts/cf-runtime/Chart.yaml

Lines changed: 2 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.29
4+
version: 6.3.30
55
keywords:
66
- codefresh
77
- runner
@@ -18,7 +18,7 @@ annotations:
1818
# Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
1919
artifacthub.io/changes: |
2020
- kind: added
21-
description: Add default workflow limits.
21+
description: Add pullPolicy for dind and engine
2222
dependencies:
2323
- name: cf-common
2424
repository: oci://quay.io/codefresh/charts

charts/cf-runtime/README.md

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

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

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

@@ -1013,10 +1013,10 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
10131013
| runtime.accounts | list | `[]` | (for On-Premise only) Assign accounts to runtime (list of account ids) |
10141014
| runtime.agent | bool | `true` | (for On-Premise only) Enable agent |
10151015
| runtime.description | string | `""` | Runtime description |
1016-
| runtime.dind | object | `{"affinity":{},"env":{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":"true"},"image":{"registry":"quay.io","repository":"codefresh/dind","tag":"26.0.0-1.28.6"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"pvcs":{"dind":{"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}},"resources":{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
1016+
| runtime.dind | object | `{"affinity":{},"env":{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":"true"},"image":{"pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.0.0-1.28.6"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"pvcs":{"dind":{"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}},"resources":{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
10171017
| runtime.dind.affinity | object | `{}` | Set affinity |
10181018
| runtime.dind.env | object | `{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":"true"}` | Set additional env vars. |
1019-
| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"26.0.0-1.28.6"}` | Set dind image. |
1019+
| runtime.dind.image | object | `{"pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.0.0-1.28.6"}` | Set dind image. |
10201020
| runtime.dind.nodeSelector | object | `{}` | Set node selector. |
10211021
| runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
10221022
| runtime.dind.podLabels | object | `{}` | Set pod labels. |
@@ -1034,15 +1034,15 @@ 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":{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","FORCE_COMPOSE_SERIAL_PULL":"false","LOGGER_LEVEL":"debug","LOG_OUTGOING_HTTP_REQUESTS":"false"},"image":{"registry":"quay.io","repository":"codefresh/engine","tag":"1.170.0"},"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.17","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":[],"workflowLimits":{"MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS":600,"MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION":86400,"MAXIMUM_ELECTED_STATE_AGE_ALLOWED":900,"MAXIMUM_RETRY_ATTEMPTS_ALLOWED":20,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED":900,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE":300,"TIME_ENGINE_INACTIVE_UNTIL_TERMINATION":300,"TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY":60,"TIME_INACTIVE_UNTIL_TERMINATION":2700}}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
1037+
| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","FORCE_COMPOSE_SERIAL_PULL":"false","LOGGER_LEVEL":"debug","LOG_OUTGOING_HTTP_REQUESTS":"false"},"image":{"pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/engine","tag":"1.170.0"},"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.17","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":[],"workflowLimits":{"MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS":600,"MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION":86400,"MAXIMUM_ELECTED_STATE_AGE_ALLOWED":900,"MAXIMUM_RETRY_ATTEMPTS_ALLOWED":20,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED":900,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE":300,"TIME_ENGINE_INACTIVE_UNTIL_TERMINATION":300,"TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY":60,"TIME_INACTIVE_UNTIL_TERMINATION":2700}}` | 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. |
10401040
| runtime.engine.env | object | `{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":"1000","FORCE_COMPOSE_SERIAL_PULL":"false","LOGGER_LEVEL":"debug","LOG_OUTGOING_HTTP_REQUESTS":"false"}` | Set additional env vars. |
10411041
| runtime.engine.env.CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS | string | `"1000"` | Interval to check the exec status in the container-logger |
10421042
| runtime.engine.env.FORCE_COMPOSE_SERIAL_PULL | string | `"false"` | If "true", composition images will be pulled sequentially |
10431043
| runtime.engine.env.LOGGER_LEVEL | string | `"debug"` | Level of logging for engine |
10441044
| runtime.engine.env.LOG_OUTGOING_HTTP_REQUESTS | string | `"false"` | Enable debug-level logging of outgoing HTTP/HTTPS requests |
1045-
| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.170.0"}` | Set image. |
1045+
| runtime.engine.image | object | `{"pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/engine","tag":"1.170.0"}` | Set image. |
10461046
| runtime.engine.nodeSelector | object | `{}` | Set node selector. |
10471047
| runtime.engine.podAnnotations | object | `{}` | Set pod annotations. |
10481048
| runtime.engine.podLabels | object | `{}` | Set pod labels. |

charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ runtimeScheduler:
1313
{{- if $engineContext.image }}
1414
image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $engineContext.image "context" .) | quote }}
1515
{{- end }}
16+
imagePullPolicy: {{ $engineContext.image.pullPolicy }}
1617
{{- with $engineContext.command }}
1718
command: {{- toYaml . | nindent 4 }}
1819
{{- end }}
@@ -80,6 +81,7 @@ dockerDaemonScheduler:
8081
{{- if $dindContext.image }}
8182
dindImage: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $dindContext.image "context" .) | quote }}
8283
{{- end }}
84+
imagePullPolicy: {{ $dindContext.image.pullPolicy }}
8385
{{- with $dindContext.userAccess }}
8486
userAccess: {{ . }}
8587
{{- end }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ tests:
3232
runtimeScheduler:
3333
type: KubernetesPod
3434
image: "somedomain.io/codefresh/engine:tagoverride"
35+
imagePullPolicy: IfNotPresent
3536
command:
3637
- npm
3738
- run
@@ -78,6 +79,7 @@ tests:
7879
dockerDaemonScheduler:
7980
type: DindKubernetesPod
8081
dindImage: "somedomain.io/codefresh/dind:tagoverride"
82+
imagePullPolicy: IfNotPresent
8183
userAccess: true
8284
envVars:
8385
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ tests:
3939
runtimeScheduler:
4040
type: KubernetesPod
4141
image: "quay.io/codefresh/engine:tagoverride"
42+
imagePullPolicy: IfNotPresent
4243
command:
4344
- one
4445
- two
@@ -103,6 +104,7 @@ tests:
103104
dockerDaemonScheduler:
104105
type: DindKubernetesPod
105106
dindImage: "quay.io/codefresh/dind:tagoverride"
107+
imagePullPolicy: IfNotPresent
106108
userAccess: true
107109
envVars:
108110
ALICE: BOB

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ tests:
4040
runtimeScheduler:
4141
type: KubernetesPod
4242
image: "quay.io/codefresh/engine:tagoverride"
43+
imagePullPolicy: Always
4344
command:
4445
- one
4546
- two
@@ -113,6 +114,7 @@ tests:
113114
dockerDaemonScheduler:
114115
type: DindKubernetesPod
115116
dindImage: "quay.io/codefresh/dind:tagoverride"
117+
imagePullPolicy: Always
116118
userAccess: true
117119
envVars:
118120
ALICE: BOB

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ runtime:
22
dind:
33
image:
44
tag: tagoverride
5+
pullPolicy: Always
56
resources:
67
requests: null
78
limits:
@@ -51,6 +52,7 @@ runtime:
5152
engine:
5253
image:
5354
tag: tagoverride
55+
pullPolicy: Always
5456
command:
5557
- one
5658
- two
@@ -102,4 +104,4 @@ runtime:
102104
key: codefresh.io
103105
operator: Equal
104106
value: engine
105-
serviceAccount: service-account-override
107+
serviceAccount: service-account-override

charts/cf-runtime/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ runtime:
432432
registry: quay.io
433433
repository: codefresh/dind
434434
tag: 26.0.0-1.28.6 # use `latest-rootless/rootless/26.0.0-1.28.6-rootless` tags for rootless-dind
435+
pullPolicy: IfNotPresent
435436
# -- Set dind resources.
436437
resources:
437438
requests: null
@@ -501,6 +502,7 @@ runtime:
501502
registry: quay.io
502503
repository: codefresh/engine
503504
tag: 1.170.0
505+
pullPolicy: IfNotPresent
504506
# -- Set container command.
505507
command:
506508
- npm

0 commit comments

Comments
 (0)