Skip to content

Commit

Permalink
chore: update image version to v2.0.1-beta.2 (#25)
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
gaius-qi authored Nov 17, 2021
1 parent e3d9e72 commit 30fa430
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
14 changes: 7 additions & 7 deletions charts/dragonfly/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: dragonfly
description: Dragonfly is an intelligent P2P based image and file distribution system
icon: https://github.com/dragonflyoss/Dragonfly2/main/docs/en/images/logo/dragonfly.svg
type: application
version: "0.5.18"
appVersion: "0.5.18"
version: "0.5.19"
appVersion: "0.5.19"
keywords:
- dragonfly
- d7y
Expand All @@ -18,21 +18,21 @@ sources:

annotations:
artifacthub.io/changes: |
- Support disable auto back source in dfdaemon
- Update image version to v2.0.1-beta.2
artifacthub.io/links: |
- name: Chart Source
url: https://github.com/dragonflyoss/helm-charts
- name: Source
url: https://github.com/dragonflyoss/Dragonfly2
artifacthub.io/images: |
- name: manager
image: dragonflyoss/manager:v2.0.1
image: dragonflyoss/manager:v2.0.1-beta.2
- name: cdn
image: dragonflyoss/cdn:v2.0.1
image: dragonflyoss/cdn:v2.0.1-beta.2
- name: dfdaemon
image: dragonflyoss/dfdaemon:v2.0.1
image: dragonflyoss/dfdaemon:v2.0.1-beta.2
- name: scheduler
image: dragonflyoss/scheduler:v2.0.1
image: dragonflyoss/scheduler:v2.0.1-beta.2
dependencies:
- name: mysql
Expand Down
11 changes: 5 additions & 6 deletions charts/dragonfly/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dragonfly Helm Chart

![Version: 0.5.18](https://img.shields.io/badge/Version-0.5.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.18](https://img.shields.io/badge/AppVersion-0.5.18-informational?style=flat-square)
![Version: 0.5.19](https://img.shields.io/badge/Version-0.5.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.19](https://img.shields.io/badge/AppVersion-0.5.19-informational?style=flat-square)

Provide efficient, stable, secure, low-cost file and image distribution services to be the best practice and standard solution in the related Cloud-Native area.

Expand Down Expand Up @@ -173,15 +173,14 @@ helm delete dragonfly --namespace dragonfly-system
| cdn.resources | object | `{"limits":{"cpu":"4","memory":"8Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits |
| cdn.service | object | `{"extraPorts":[{"name":"http-nginx","port":8001,"targetPort":8001}],"port":8003,"targetPort":8003,"type":"ClusterIP"}` | Service configuration |
| cdn.statefulsetAnnotations | object | `{}` | Statefulset annotations |
| cdn.tag | string | `"v2.0.1"` | Image tag |
| cdn.tag | string | `"v2.0.1-beta.2"` | Image tag |
| cdn.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
| cdn.tolerations | list | `[]` | List of node taints to tolerate |
| clusterDomain | string | `"cluster.local"` | Install application cluster domain |
| containerRuntime | object | `{"containerd":{"enable":false,"injectConfigPath":false,"registries":["https://ghcr.io","https://quay.io","https://harbor.example.com:8443"]},"crio":{"enable":false,"registries":["https://ghcr.io","https://quay.io","https://harbor.example.com:8443"]},"docker":{"caCert":{"commonName":"Dragonfly Authority CA","countryName":"CN","localityName":"Hangzhou","organizationName":"Dragonfly","stateOrProvinceName":"Hangzhou"},"enable":false,"injectHosts":true,"insecure":false,"registryDomains":["ghcr.io","quay.io"],"registryPorts":[443],"restart":false,"skipHosts":["127.0.0.1","docker.io"]},"initContainerImage":"dragonflyoss/openssl"}` | [Experimental] Container runtime support Choose special container runtime in Kubernetes. Support: Containerd, Docker |
| containerRuntime.containerd | object | `{"enable":false,"injectConfigPath":false,"registries":["https://ghcr.io","https://quay.io","https://harbor.example.com:8443"]}` | [Experimental] Containerd support |
| containerRuntime.containerd.enable | bool | `false` | Enable containerd support Inject mirror config into /etc/containerd/config.toml, if config_path is enabled in /etc/containerd/config.toml, the config take effect real time, but if config_path is not enabled in /etc/containerd/config.toml, need restart containerd to take effect. When the version in /etc/containerd/config.toml is "1", inject dfdaemon.config.proxy.registryMirror.url as registry mirror and restart containerd. When the version in /etc/containerd/config.toml is "2": 1. when config_path is enabled in /etc/containerd/config.toml, inject containerRuntime.containerd.registries into config_path, 2. when containerRuntime.containerd.injectConfigPath=true, inject config_path into /etc/containerd/config.toml and inject containerRuntime.containerd.registries into config_path, 3. when not config_path in /etc/containerd/config.toml and containerRuntime.containerd.injectConfigPath=false, inject dfdaemon.config.proxy.registryMirror.url as registry mirror and restart containerd. |
| containerRuntime.containerd.injectConfigPath | bool | `false` | Config path for multiple registries By default, init container will check /etc/containerd/config.toml, whether is config_path configured, if not, init container will just add the dfdaemon.config.proxy.registryMirror.url for registry mirror. When configPath is true, init container will inject config_path=/etc/containerd/certs.d and configure all registries. |
| containerRuntime.containerd.registries | list | `["https://ghcr.io","https://quay.io","https://harbor.example.com:8443"]` | Only used when config_path is enabled in /etc/containerd/config.toml or containerRuntime.containerd.injectConfigPath=true |
| containerRuntime.crio | object | `{"enable":false,"registries":["https://ghcr.io","https://quay.io","https://harbor.example.com:8443"]}` | [Experimental] CRI-O support |
| containerRuntime.crio.enable | bool | `false` | Enable CRI-O support Inject drop-in mirror config into /etc/containers/registries.conf.d. |
| containerRuntime.docker | object | `{"caCert":{"commonName":"Dragonfly Authority CA","countryName":"CN","localityName":"Hangzhou","organizationName":"Dragonfly","stateOrProvinceName":"Hangzhou"},"enable":false,"injectHosts":true,"insecure":false,"registryDomains":["ghcr.io","quay.io"],"registryPorts":[443],"restart":false,"skipHosts":["127.0.0.1","docker.io"]}` | [Experimental] Support docker, when use docker-shim in Kubernetes, please set containerRuntime.docker.enable to true. For supporting docker, we need generate CA and update certs, then hijack registries traffic, By default, it's unnecessary to restart docker daemon when pull image from private registries, this feature is support explicit registries in containerRuntime.registry.domains, default domains is ghcr.io, quay.io, please update your registries by --set containerRuntime.registry.domains='{harbor.example.com,harbor.example.net}' --set containerRuntime.registry.injectHosts=true --set containerRuntime.docker.enable=true Caution: **We did not recommend to using dragonfly with docker in Kubernetes** due to many reasons: 1. no fallback image pulling policy. 2. deprecated in Kubernetes. Because the original `daemonset` in Kubernetes did not support `Surging Rolling Update` policy. When kill current dfdaemon pod, the new pod image can not be pulled anymore. If you can not change runtime from docker to others, remind to choose a plan when upgrade dfdaemon: Option 1: pull newly dfdaemon image manually before upgrade dragonfly, or use [ImagePullJob](https://openkruise.io/docs/user-manuals/imagepulljob) to pull image automate. Option 2: keep the image registry of dragonfly is different from common registries and add host in `containerRuntime.docker.skipHosts`. Caution: docker hub image is not supported without restart docker daemon. When need pull image from docker hub or any other registries not in containerRuntime.registry.domains, set containerRuntime.docker.restart=true this feature will inject proxy config into docker.service and restart docker daemon. Caution: set restart to true only when live restore is enable. Requirement: Docker Engine v1.2.0+ without Rootless. |
Expand Down Expand Up @@ -248,7 +247,7 @@ helm delete dragonfly --namespace dragonfly-system
| dfdaemon.priorityClassName | string | `""` | Pod priorityClassName |
| dfdaemon.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| dfdaemon.resources | object | `{"limits":{"cpu":"2","memory":"2Gi"},"requests":{"cpu":"0","memory":"0"}}` | Pod resource requests and limits |
| dfdaemon.tag | string | `"v2.0.1"` | Image tag |
| dfdaemon.tag | string | `"v2.0.1-beta.2"` | Image tag |
| dfdaemon.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
| dfdaemon.tolerations | list | `[]` | List of node taints to tolerate |
| externalManager.grpcPort | int | `65003` | External GRPC service port |
Expand Down Expand Up @@ -306,7 +305,7 @@ helm delete dragonfly --namespace dragonfly-system
| manager.service.annotations | object | `{}` | Service annotations |
| manager.service.labels | object | `{}` | Service labels |
| manager.service.type | string | `"ClusterIP"` | Service type |
| manager.tag | string | `"v2.0.1"` | Image tag |
| manager.tag | string | `"v2.0.1-beta.2"` | Image tag |
| manager.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
| manager.tolerations | list | `[]` | List of node taints to tolerate |
| mysql.auth.database | string | `"manager"` | Mysql database name |
Expand Down Expand Up @@ -367,7 +366,7 @@ helm delete dragonfly --namespace dragonfly-system
| scheduler.service.targetPort | int | `8002` | Service targetPort |
| scheduler.service.type | string | `"ClusterIP"` | Service type |
| scheduler.statefulsetAnnotations | object | `{}` | Statefulset annotations |
| scheduler.tag | string | `"v2.0.1"` | Image tag |
| scheduler.tag | string | `"v2.0.1-beta.2"` | Image tag |
| scheduler.terminationGracePeriodSeconds | string | `nil` | Pod terminationGracePeriodSeconds |
| scheduler.tolerations | list | `[]` | List of node taints to tolerate |

Expand Down
8 changes: 4 additions & 4 deletions charts/dragonfly/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ scheduler:
# -- Image repository
image: dragonflyoss/scheduler
# -- Image tag
tag: v2.0.1
tag: v2.0.1-beta.2
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Host Aliases
Expand Down Expand Up @@ -241,7 +241,7 @@ cdn:
# -- Image repository
image: dragonflyoss/cdn
# -- Image tag
tag: v2.0.1
tag: v2.0.1-beta.2
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Host Aliases
Expand Down Expand Up @@ -405,7 +405,7 @@ dfdaemon:
# -- Image repository
image: dragonflyoss/dfdaemon
# -- Image tag
tag: v2.0.1
tag: v2.0.1-beta.2
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Host Aliases
Expand Down Expand Up @@ -577,7 +577,7 @@ manager:
# -- Image repository
image: dragonflyoss/manager
# -- Image tag
tag: v2.0.1
tag: v2.0.1-beta.2
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Host Aliases
Expand Down

0 comments on commit 30fa430

Please sign in to comment.