Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade dind to 26.0.0-1.28.6 #454

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion charts/cf-runtime/.ci/values-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runner:
runtime:
dind:
image:
tag: 25.0.4-1.28.5-rootless
tag: 26.0.0-1.28.6-rootless
podLabels:
key: dind
resources:
Expand All @@ -33,6 +33,8 @@ runtime:
limits:
cpu: 1000m
memory: 1024Mi
env:
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
engine:
podLabels:
key: engine
Expand Down
12 changes: 5 additions & 7 deletions charts/cf-runtime/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Codefresh Runner
name: cf-runtime
version: 6.3.19
version: 6.3.20
keywords:
- codefresh
- runner
Expand All @@ -14,15 +14,13 @@ maintainers:
url: https://codefresh-io.github.io/
annotations:
# 💡 Do not forget to update this annotation:
artifacthub.io/containsSecurityUpdates: "false"
artifacthub.io/containsSecurityUpdates: "true"
# Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
artifacthub.io/changes: |
- kind: changed
description: Upgrade engine to v1.169.9
- kind: changed
description: Upgrade cf-app-proxy to v0.0.47
- kind: fixed
description: Fix TLS for MongoDB and Redis
description: Upgrade dind to 26.0.0-1.28.6
- kind: security
description: Fix some CVE
dependencies:
- name: cf-common
repository: oci://quay.io/codefresh/charts
Expand Down
8 changes: 4 additions & 4 deletions charts/cf-runtime/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Codefresh Runner

![Version: 6.3.19](https://img.shields.io/badge/Version-6.3.19-informational?style=flat-square)
![Version: 6.3.20](https://img.shields.io/badge/Version-6.3.20-informational?style=flat-square)

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

Expand Down Expand Up @@ -1013,10 +1013,10 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
| runtime.accounts | list | `[]` | (for On-Premise only) Assign accounts to runtime (list of account ids) |
| runtime.agent | bool | `true` | (for On-Premise only) Enable agent |
| runtime.description | string | `""` | Runtime description |
| 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). |
| 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). |
| runtime.dind.affinity | object | `{}` | Set affinity |
| runtime.dind.env | object | `{}` | Set additional env vars. |
| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"25.0.4-1.28.5"}` | Set dind image. |
| runtime.dind.env | object | `{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":"true"}` | Set additional env vars. |
| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"26.0.0-1.28.6"}` | Set dind image. |
| runtime.dind.nodeSelector | object | `{}` | Set node selector. |
| runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
| runtime.dind.podLabels | object | `{}` | Set pod labels. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ tests:
type: DindKubernetesPod
dindImage: "somedomain.io/codefresh/dind:tagoverride"
userAccess: true
envVars:
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
cluster:
namespace: codefresh
serviceAccount: codefresh-engine
Expand Down
1 change: 1 addition & 0 deletions charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ tests:
userAccess: true
envVars:
ALICE: BOB
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
cluster:
namespace: codefresh
serviceAccount: service-account-override
Expand Down
1 change: 1 addition & 0 deletions charts/cf-runtime/tests/runtime/runtime_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ tests:
userAccess: true
envVars:
ALICE: BOB
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
cluster:
namespace: codefresh
serviceAccount: service-account-override
Expand Down
5 changes: 3 additions & 2 deletions charts/cf-runtime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ runtime:
image:
registry: quay.io
repository: codefresh/dind
tag: 25.0.4-1.28.5 # use `latest-rootless/rootless/25.0.4-1.28.5-rootless` tags for rootless-dind
tag: 26.0.0-1.28.6 # use `latest-rootless/rootless/26.0.0-1.28.6-rootless` tags for rootless-dind
# -- Set dind resources.
resources:
requests: null
Expand All @@ -455,7 +455,8 @@ runtime:
reuseVolumeSelector: codefresh-app,io.codefresh.accountName
reuseVolumeSortOrder: pipeline_id
# -- Set additional env vars.
env: {}
env:
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
# -- Set pod annotations.
podAnnotations: {}
# -- Set pod labels.
Expand Down