Skip to content

Commit 4eaa2e5

Browse files
build: upgrade dind to 26.0.0-1.28.6 (#454)
1 parent c990fb6 commit 4eaa2e5

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

charts/cf-runtime/.ci/values-ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runner:
2323
runtime:
2424
dind:
2525
image:
26-
tag: 25.0.4-1.28.5-rootless
26+
tag: 26.0.0-1.28.6-rootless
2727
podLabels:
2828
key: dind
2929
resources:
@@ -33,6 +33,8 @@ runtime:
3333
limits:
3434
cpu: 1000m
3535
memory: 1024Mi
36+
env:
37+
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
3638
engine:
3739
podLabels:
3840
key: engine

charts/cf-runtime/Chart.yaml

Lines changed: 5 additions & 7 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.19
4+
version: 6.3.20
55
keywords:
66
- codefresh
77
- runner
@@ -14,15 +14,13 @@ maintainers:
1414
url: https://codefresh-io.github.io/
1515
annotations:
1616
# 💡 Do not forget to update this annotation:
17-
artifacthub.io/containsSecurityUpdates: "false"
17+
artifacthub.io/containsSecurityUpdates: "true"
1818
# Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
1919
artifacthub.io/changes: |
2020
- kind: changed
21-
description: Upgrade engine to v1.169.9
22-
- kind: changed
23-
description: Upgrade cf-app-proxy to v0.0.47
24-
- kind: fixed
25-
description: Fix TLS for MongoDB and Redis
21+
description: Upgrade dind to 26.0.0-1.28.6
22+
- kind: security
23+
description: Fix some CVE
2624
dependencies:
2725
- name: cf-common
2826
repository: oci://quay.io/codefresh/charts

charts/cf-runtime/README.md

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

3-
![Version: 6.3.19](https://img.shields.io/badge/Version-6.3.19-informational?style=flat-square)
3+
![Version: 6.3.20](https://img.shields.io/badge/Version-6.3.20-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":{},"image":{"registry":"quay.io","repository":"codefresh/dind","tag":"25.0.4-1.28.5"},"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":{"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 |
1018-
| runtime.dind.env | object | `{}` | Set additional env vars. |
1019-
| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"25.0.4-1.28.5"}` | Set dind image. |
1018+
| 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. |
10201020
| runtime.dind.nodeSelector | object | `{}` | Set node selector. |
10211021
| runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
10221022
| runtime.dind.podLabels | object | `{}` | Set pod labels. |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ tests:
6767
type: DindKubernetesPod
6868
dindImage: "somedomain.io/codefresh/dind:tagoverride"
6969
userAccess: true
70+
envVars:
71+
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
7072
cluster:
7173
namespace: codefresh
7274
serviceAccount: codefresh-engine

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ tests:
9494
userAccess: true
9595
envVars:
9696
ALICE: BOB
97+
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
9798
cluster:
9899
namespace: codefresh
99100
serviceAccount: service-account-override

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ tests:
104104
userAccess: true
105105
envVars:
106106
ALICE: BOB
107+
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
107108
cluster:
108109
namespace: codefresh
109110
serviceAccount: service-account-override

charts/cf-runtime/values.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ runtime:
431431
image:
432432
registry: quay.io
433433
repository: codefresh/dind
434-
tag: 25.0.4-1.28.5 # use `latest-rootless/rootless/25.0.4-1.28.5-rootless` tags for rootless-dind
434+
tag: 26.0.0-1.28.6 # use `latest-rootless/rootless/26.0.0-1.28.6-rootless` tags for rootless-dind
435435
# -- Set dind resources.
436436
resources:
437437
requests: null
@@ -455,7 +455,8 @@ runtime:
455455
reuseVolumeSelector: codefresh-app,io.codefresh.accountName
456456
reuseVolumeSortOrder: pipeline_id
457457
# -- Set additional env vars.
458-
env: {}
458+
env:
459+
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
459460
# -- Set pod annotations.
460461
podAnnotations: {}
461462
# -- Set pod labels.

0 commit comments

Comments
 (0)