dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: update charts and optimize charts values by image tag (#3187) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2024-04-15 12:20:10 +08:00 committed by GitHub
parent 95e5297008
commit c40e5ede9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 133 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/compatibility-e2e-with-client-go.yml vendored
View File

@ -147,7 +147,7 @@ jobs:
- name: Setup dragonfly - name: Setup dragonfly
run: | run: |
helm install --wait --timeout 10m --dependency-update --create-namespace --namespace dragonfly-system --set ${{ matrix.chart-name }}.tag=${{ matrix.image-tag }} --set ${{ matrix.chart-name }}.image=dragonflyoss/${{ matrix.image }} -f ${{ env.DRAGONFLY_CHARTS_CONFIG_PATH }} dragonfly ${{ env.DRAGONFLY_CHARTS_PATH }} helm install --wait --timeout 10m --dependency-update --create-namespace --namespace dragonfly-system --set ${{ matrix.chart-name }}.image.tag=${{ matrix.image-tag }} --set ${{ matrix.chart-name }}.image.repository=dragonflyoss/${{ matrix.image }} -f ${{ env.DRAGONFLY_CHARTS_CONFIG_PATH }} dragonfly ${{ env.DRAGONFLY_CHARTS_PATH }}
kubectl apply -f ${{ env.DRAGONFLY_FILE_SERVER_PATH }} kubectl apply -f ${{ env.DRAGONFLY_FILE_SERVER_PATH }}
kubectl apply -f ${{ env.DRAGONFLY_FILE_SERVER_NO_CONTENT_LENGTH_PATH }} kubectl apply -f ${{ env.DRAGONFLY_FILE_SERVER_NO_CONTENT_LENGTH_PATH }}
kubectl apply -f ${{ env.DRAGONFLY_PROXY_SERVER_PATH }} kubectl apply -f ${{ env.DRAGONFLY_PROXY_SERVER_PATH }}

2
deploy/helm-charts

@ -1 +1 @@
Subproject commit 3703273eb1203e14bccf25ccd58547118d509836 Subproject commit 900cc6f36f6b0c742e994a73c6fb79e73872eda2

2
test/e2e/dfget_test.go
View File

@ -200,7 +200,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// slow download // slow download
Expect(end.Sub(start).Seconds() < 300.0).To(Equal(true)) Expect(end.Sub(start).Seconds() < 500.0).To(Equal(true))
} }
// calculate downloaded files sha256sum // calculate downloaded files sha256sum

2
test/e2e/e2e_test.go
View File

@ -121,7 +121,7 @@ var _ = BeforeSuite(func() {
fmt.Printf("special image name: %s\n", image) fmt.Printf("special image name: %s\n", image)
stableImageTag := os.Getenv("DRAGONFLY_STABLE_IMAGE_TAG") stableImageTag := os.Getenv("DRAGONFLY_STABLE_IMAGE_TAG")
Expect(fmt.Sprintf("dragonflyoss/%s:%s", imageName, stableImageTag)).To(Equal(image)) Expect(fmt.Sprintf("docker.io/dragonflyoss/%s:%s", imageName, stableImageTag)).To(Equal(image))
} }
rawGitCommit, err := util.GitCommand("rev-parse", "--short", "HEAD").CombinedOutput() rawGitCommit, err := util.GitCommand("rev-parse", "--short", "HEAD").CombinedOutput()

12
test/testdata/charts/config-cache-list-metadata.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -71,7 +73,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -123,7 +126,8 @@ dfdaemon:
- regx: file-server - regx: file-server
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-compatibility.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -71,7 +73,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -120,7 +123,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-concurent-back-source.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -75,7 +77,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -128,7 +131,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

9
test/testdata/charts/config-disable-seed-peer.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -42,7 +43,8 @@ seedPeer:
enable: false enable: false
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -93,7 +95,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-grpc-tls-ipv6.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -76,7 +77,8 @@ scheduler:
enableIPv6: true enableIPv6: true
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -153,7 +155,8 @@ seedPeer:
enableIPv6: true enableIPv6: true
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -245,7 +248,8 @@ dfdaemon:
enableIPv6: true enableIPv6: true
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-grpc-tls.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -74,7 +75,8 @@ scheduler:
-----END CERTIFICATE----- -----END CERTIFICATE-----
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -149,7 +151,8 @@ seedPeer:
-----END CERTIFICATE----- -----END CERTIFICATE-----
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -239,7 +242,8 @@ dfdaemon:
-----END CERTIFICATE----- -----END CERTIFICATE-----
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-ipv6.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -39,7 +40,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -75,7 +77,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -126,7 +129,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-rs.yaml vendored
View File

@ -1,5 +1,6 @@
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:
@ -26,7 +27,8 @@ manager:
verbose: true verbose: true
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -56,7 +58,8 @@ scheduler:
seedClient: seedClient:
enable: true enable: true
replicas: 3 replicas: 3
image: dragonflyoss/client image:
repository: dragonflyoss/client
tag: latest tag: latest
resources: resources:
requests: requests:
@ -86,7 +89,8 @@ seedClient:
client: client:
enable: true enable: true
image: dragonflyoss/client image:
repository: dragonflyoss/client
tag: latest tag: latest
resources: resources:
requests: requests:

12
test/testdata/charts/config-split-running-tasks.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -71,7 +73,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -121,7 +124,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config-write-buffer-size.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -73,7 +75,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -124,7 +127,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources:

12
test/testdata/charts/config.yaml vendored
View File

@ -1,5 +1,6 @@
scheduler: scheduler:
image: dragonflyoss/scheduler image:
repository: dragonflyoss/scheduler
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -37,7 +38,8 @@ scheduler:
ttl: 5m ttl: 5m
seedPeer: seedPeer:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
replicas: 3 replicas: 3
resources: resources:
@ -71,7 +73,8 @@ seedPeer:
interval: 20s interval: 20s
dfdaemon: dfdaemon:
image: dragonflyoss/dfdaemon image:
repository: dragonflyoss/dfdaemon
tag: latest tag: latest
resources: resources:
requests: requests:
@ -120,7 +123,8 @@ dfdaemon:
interval: 20s interval: 20s
manager: manager:
image: dragonflyoss/manager image:
repository: dragonflyoss/manager
tag: latest tag: latest
replicas: 1 replicas: 1
resources: resources: