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.

Sign up for GitHub

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

Jump to bottom

fix regex when checking containerd config.toml #177

Merged
merged 4 commits into from
Jul 19, 2023
Merged

fix regex when checking containerd config.toml #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
184e399
fix regex when checking containerd config.toml
wyhysj Jun 23, 2023
d3c9f33
fix: update regex when checking containerd config.toml
wyhysj Jul 11, 2023
f7da9a4
fix: update regex when checking containerd config.toml(bump version)
wyhysj Jul 18, 2023
feefca4
Merge branch 'main' into fix/inject-registry-credentials
gaius-qi Jul 19, 2023
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
8 changes: 3 additions & 5 deletions charts/dragonfly/Chart.yaml
View file
Open in desktop
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://raw.githubusercontent.com/dragonflyoss/Dragonfly2/main/docs/images/logo/dragonfly.svg
type: application
version: 1.0.4
appVersion: 1.0.4
version: 1.0.5
appVersion: 1.0.5
keywords:
- dragonfly
- d7y
Expand All @@ -26,9 +26,7 @@ sources:

annotations:
artifacthub.io/changes: |
- Update image version to v2.1.0-alpha.6.
- Add redis configuration in scheduler.
- fix registries is http generate cert.d file name err
- Update regex when checking containerd config.toml.

artifacthub.io/links: |
- name: Chart Source
Expand Down
4 changes: 2 additions & 2 deletions charts/dragonfly/templates/dfdaemon/dfdaemon-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ spec:
need_restart=1
fi
{{- if .Values.containerRuntime.containerd.injectRegistryCredencials.enable}}
if grep "registry.config.\"$domain\".auth" $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}; then
if grep "registry.configs.\"$domain\".auth" $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}; then
echo "registry auth $registry found in {{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}, skip"
else
cat << EOF >> $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}
Expand Down Expand Up @@ -446,7 +446,7 @@ spec:
need_restart=1
fi
{{- if .Values.containerRuntime.containerd.injectRegistryCredencials.enable}}
if grep "registry.config.\"$domain\".auth" $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}; then
if grep "registry.configs.\"$domain\".auth" $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}; then
echo "registry auth $registry found in {{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}, skip"
else
cat << EOF >> $etcContainerd/{{ default "config.toml" .Values.containerRuntime.containerd.configFileName }}
Expand Down
Loading