Skip to content

Commit b6688fe

Browse files
chore(CR-30054): bump dind to 28.1.1-3.0.1 (#596)
Co-authored-by: Zhenya Tikhonov <zhenya.tikhonov@octopus.com>
1 parent e7e361d commit b6688fe

File tree

10 files changed

+40
-22
lines changed

10 files changed

+40
-22
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ runtime:
3232
limits:
3333
cpu: 1000m
3434
memory: 1024Mi
35-
env:
36-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: true
3735
engine:
3836
podLabels:
3937
key: engine

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ volumeProvisioner:
1616
runtime:
1717
dind:
1818
image:
19-
tag: 26.1.4-1.28.10-rootless
20-
digest: sha256:59dfc004eb22a8f09c8a3d585271a055af9df4591ab815bca418c24a2077f5c8
19+
tag: 28.1.1-3.0.1-rootless
20+
digest: sha256:4140e74134a5dd2874731ea5de852d9d23698965b16fa3bb947a36ca806e01a2
2121
userVolumeMounts:
2222
dind:
2323
name: dind

charts/cf-runtime/Chart.yaml

Lines changed: 7 additions & 3 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: 7.9.4
4+
version: 8.0.0
55
keywords:
66
- codefresh
77
- runner
@@ -17,8 +17,12 @@ annotations:
1717
artifacthub.io/containsSecurityUpdates: "true"
1818
# Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
1919
artifacthub.io/changes: |
20-
- kind: fixed
21-
description: "Attach runtime to agent when existing agent token is provided."
20+
- kind: changed
21+
description: Updated dind image to version 28.1.1-3.0.1
22+
- kind: deprecated
23+
description: Deprecated pushing and pulling images manifest v2 schema 1 and "Docker Image v1"
24+
- kind: security
25+
description: Fixed some vulnerabilities in dind
2226
dependencies:
2327
- name: cf-common
2428
repository: oci://quay.io/codefresh/charts

charts/cf-runtime/README.md

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

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

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

@@ -19,6 +19,7 @@ Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/insta
1919
- [To 6.x](#to-6-x)
2020
- [To 7.x](#to-7-x)
2121
- [To 7.9.x](#to-7-9-x)
22+
- [To 8.x](#to-8-x)
2223
- [Architecture](#architecture)
2324
- [Configuration](#configuration)
2425
- [EBS backend volume configuration in AWS](#ebs-backend-volume-configuration)
@@ -302,6 +303,16 @@ runtime:
302303
digest: sha256:e74494370100678ccb1c1058e6ef3ddcf67b21fcd37da8b3482376c8282549ad
303304
```
304305

306+
### To 8.x
307+
308+
⚠️⚠️⚠️ **BREAKING CHANGE** ⚠️⚠️⚠️
309+
310+
Docker engine in `dind` component is upgraded to 28.x. The main change is that in this version the image manifest v2 schema 1 and "Docker Image v1" formats were deprecated in favor of the v2 schema 2 and OCI image spec formats. Read [the official Docker documentation](https://docs.docker.com/engine/deprecated/#pushing-and-pulling-with-image-manifest-v2-schema-1) for more details.
311+
312+
This means that any existing images in your pipelines that were created using these older formats will no longer be pulled after upgrade. **This may affect pipelines operation.**
313+
314+
To avoid operation disruption, you have to identify and convert such deprecated images to modern formats. Tutorial: [https://codefresh.io/docs/docs/kb/articles/upgrade-deprecated-docker-images/](https://codefresh.io/docs/docs/kb/articles/upgrade-deprecated-docker-images/)
315+
305316
## Architecture
306317

307318
[Codefresh Runner architecture](https://codefresh.io/docs/docs/installation/codefresh-runner/#codefresh-runner-architecture)
@@ -1264,11 +1275,11 @@ Install the Helm chart
12641275
| runtime.accounts | list | `[]` | (for On-Premise only) Assign accounts to runtime (list of account ids) |
12651276
| runtime.agent | bool | `true` | (for On-Premise only) Enable agent |
12661277
| runtime.description | string | `""` | Runtime description |
1267-
| runtime.dind | object | `{"affinity":{},"containerSecurityContext":{},"env":{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":true},"image":{"digest":"sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.1.4-1.28.8"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"podSecurityContext":{},"pvcs":{"dind":{"annotations":{},"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","terminationGracePeriodSeconds":30,"tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{},"volumePermissions":{"enabled":false,"image":{"digest":"sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f","registry":"docker.io","repository":"alpine","tag":3.18},"resources":{},"securityContext":{"runAsUser":0}}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
1278+
| runtime.dind | object | `{"affinity":{},"containerSecurityContext":{},"env":{},"image":{"digest":"sha256:e6f8044b6963b3d1fbf728853aa31edff0bb26ce7613595d3b2a470482bd2cc3","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"28.1.1-3.0.1"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"podSecurityContext":{},"pvcs":{"dind":{"annotations":{},"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","terminationGracePeriodSeconds":30,"tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{},"volumePermissions":{"enabled":false,"image":{"digest":"sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f","registry":"docker.io","repository":"alpine","tag":3.18},"resources":{},"securityContext":{"runAsUser":0}}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
12681279
| runtime.dind.affinity | object | `{}` | Set affinity |
12691280
| runtime.dind.containerSecurityContext | object | `{}` | Set container security context. |
1270-
| runtime.dind.env | object | `{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":true}` | Set additional env vars. |
1271-
| runtime.dind.image | object | `{"digest":"sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.1.4-1.28.8"}` | Set dind image. |
1281+
| runtime.dind.env | object | `{}` | Set additional env vars. |
1282+
| runtime.dind.image | object | `{"digest":"sha256:e6f8044b6963b3d1fbf728853aa31edff0bb26ce7613595d3b2a470482bd2cc3","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"28.1.1-3.0.1"}` | Set dind image. |
12721283
| runtime.dind.nodeSelector | object | `{}` | Set node selector. |
12731284
| runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
12741285
| runtime.dind.podLabels | object | `{}` | Set pod labels. |

charts/cf-runtime/README.md.gotmpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/insta
1919
- [To 6.x](#to-6-x)
2020
- [To 7.x](#to-7-x)
2121
- [To 7.9.x](#to-7-9-x)
22+
- [To 8.x](#to-8-x)
2223
- [Architecture](#architecture)
2324
- [Configuration](#configuration)
2425
- [EBS backend volume configuration in AWS](#ebs-backend-volume-configuration)
@@ -302,6 +303,16 @@ runtime:
302303
digest: sha256:e74494370100678ccb1c1058e6ef3ddcf67b21fcd37da8b3482376c8282549ad
303304
```
304305

306+
### To 8.x
307+
308+
⚠️⚠️⚠️ **BREAKING CHANGE** ⚠️⚠️⚠️
309+
310+
Docker engine in `dind` component is upgraded to 28.x. The main change is that in this version the image manifest v2 schema 1 and "Docker Image v1" formats were deprecated in favor of the v2 schema 2 and OCI image spec formats. Read [the official Docker documentation](https://docs.docker.com/engine/deprecated/#pushing-and-pulling-with-image-manifest-v2-schema-1) for more details.
311+
312+
This means that any existing images in your pipelines that were created using these older formats will no longer be pulled after upgrade. **This may affect pipelines operation.**
313+
314+
To avoid operation disruption, you have to identify and convert such deprecated images to modern formats. Tutorial: [https://codefresh.io/docs/docs/kb/articles/upgrade-deprecated-docker-images/](https://codefresh.io/docs/docs/kb/articles/upgrade-deprecated-docker-images/)
315+
305316
## Architecture
306317

307318
[Codefresh Runner architecture](https://codefresh.io/docs/docs/installation/codefresh-runner/#codefresh-runner-architecture)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ tests:
8888
dindImage: 'somedomain.io/codefresh/dind:tagoverride'
8989
imagePullPolicy: IfNotPresent
9090
userAccess: true
91-
envVars:
92-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
9391
cluster:
9492
namespace: codefresh
9593
serviceAccount: codefresh-engine

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ tests:
120120
userAccess: true
121121
envVars:
122122
ALICE: 'BOB'
123-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
124123
FLOAT_AS_STRING: '12.34'
125124
INT: '123'
126125
cluster:
@@ -307,7 +306,6 @@ tests:
307306
userAccess: true
308307
envVars:
309308
ALICE: 'BOB'
310-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
311309
FLOAT_AS_STRING: '12.34'
312310
INT: '123'
313311
cluster:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ tests:
131131
userAccess: true
132132
envVars:
133133
ALICE: 'BOB'
134-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
135134
FLOAT: '12.34'
136135
INT_AS_STRING: '123'
137136
cluster:

charts/cf-runtime/values-rootless.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ volumeProvisioner:
1919
runtime:
2020
dind:
2121
image:
22-
tag: 26.1.4-1.28.10-rootless
23-
digest: sha256:59dfc004eb22a8f09c8a3d585271a055af9df4591ab815bca418c24a2077f5c8
22+
tag: 28.1.1-3.0.1-rootless
23+
digest: sha256:4140e74134a5dd2874731ea5de852d9d23698965b16fa3bb947a36ca806e01a2
2424
userVolumeMounts:
2525
dind:
2626
name: dind

charts/cf-runtime/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ runtime:
413413
image:
414414
registry: quay.io
415415
repository: codefresh/dind
416-
tag: 26.1.4-1.28.8 # use `latest-rootless/rootless/26.1.4-1.28.8-rootless` tags for rootless-dind
416+
tag: 28.1.1-3.0.1 # use `latest-rootless/rootless/28.1.1-3.0.1-rootless` tags for rootless-dind
417417
pullPolicy: IfNotPresent
418-
digest: sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e
418+
digest: sha256:e6f8044b6963b3d1fbf728853aa31edff0bb26ce7613595d3b2a470482bd2cc3
419419
# -- Set dind resources.
420420
resources:
421421
requests: null
@@ -446,8 +446,7 @@ runtime:
446446
# annotations:
447447
# codefresh.io/volume-retention: 7d
448448
# -- Set additional env vars.
449-
env:
450-
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: true
449+
env: {}
451450
# -- Set pod annotations.
452451
podAnnotations: {}
453452
# -- Set pod labels.

0 commit comments

Comments
 (0)