diff --git a/.github/workflows/compatibility-e2e-with-client-go.yml b/.github/workflows/compatibility-e2e-with-client-go.yml index a6d4bb551..cf463ba0f 100644 --- a/.github/workflows/compatibility-e2e-with-client-go.yml +++ b/.github/workflows/compatibility-e2e-with-client-go.yml @@ -147,7 +147,7 @@ jobs: - name: Setup dragonfly 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_NO_CONTENT_LENGTH_PATH }} kubectl apply -f ${{ env.DRAGONFLY_PROXY_SERVER_PATH }} diff --git a/deploy/helm-charts b/deploy/helm-charts index 3703273eb..900cc6f36 160000 --- a/deploy/helm-charts +++ b/deploy/helm-charts @@ -1 +1 @@ -Subproject commit 3703273eb1203e14bccf25ccd58547118d509836 +Subproject commit 900cc6f36f6b0c742e994a73c6fb79e73872eda2 diff --git a/test/e2e/dfget_test.go b/test/e2e/dfget_test.go index ea911c6d7..818bf2d9d 100644 --- a/test/e2e/dfget_test.go +++ b/test/e2e/dfget_test.go @@ -200,7 +200,7 @@ func singleDfgetTest(name, ns, label, podNamePrefix, container string) { Expect(err).NotTo(HaveOccurred()) // 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 diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 3c05d4f34..d822814c5 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -121,7 +121,7 @@ var _ = BeforeSuite(func() { fmt.Printf("special image name: %s\n", image) 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() diff --git a/test/testdata/charts/config-cache-list-metadata.yaml b/test/testdata/charts/config-cache-list-metadata.yaml index 2e8bb2870..26962f8e6 100644 --- a/test/testdata/charts/config-cache-list-metadata.yaml +++ b/test/testdata/charts/config-cache-list-metadata.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -71,8 +73,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -123,8 +126,9 @@ dfdaemon: - regx: file-server manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-compatibility.yaml b/test/testdata/charts/config-compatibility.yaml index 0f65a3043..ea4a51d29 100644 --- a/test/testdata/charts/config-compatibility.yaml +++ b/test/testdata/charts/config-compatibility.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -71,8 +73,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -120,8 +123,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-concurent-back-source.yaml b/test/testdata/charts/config-concurent-back-source.yaml index 7cc38662a..8f5f3f44c 100644 --- a/test/testdata/charts/config-concurent-back-source.yaml +++ b/test/testdata/charts/config-concurent-back-source.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -75,8 +77,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -128,8 +131,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-disable-seed-peer.yaml b/test/testdata/charts/config-disable-seed-peer.yaml index c87ad81f6..ac59acfbc 100644 --- a/test/testdata/charts/config-disable-seed-peer.yaml +++ b/test/testdata/charts/config-disable-seed-peer.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -42,8 +43,9 @@ seedPeer: enable: false dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -93,8 +95,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-grpc-tls-ipv6.yaml b/test/testdata/charts/config-grpc-tls-ipv6.yaml index 80799b700..bc1554e97 100644 --- a/test/testdata/charts/config-grpc-tls-ipv6.yaml +++ b/test/testdata/charts/config-grpc-tls-ipv6.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -76,8 +77,9 @@ scheduler: enableIPv6: true seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -153,8 +155,9 @@ seedPeer: enableIPv6: true dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -245,8 +248,9 @@ dfdaemon: enableIPv6: true manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-grpc-tls.yaml b/test/testdata/charts/config-grpc-tls.yaml index f1ea8532a..e70211b2a 100644 --- a/test/testdata/charts/config-grpc-tls.yaml +++ b/test/testdata/charts/config-grpc-tls.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -74,8 +75,9 @@ scheduler: -----END CERTIFICATE----- seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -149,8 +151,9 @@ seedPeer: -----END CERTIFICATE----- dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -239,8 +242,9 @@ dfdaemon: -----END CERTIFICATE----- manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-ipv6.yaml b/test/testdata/charts/config-ipv6.yaml index a5514dac5..8c6eb3482 100644 --- a/test/testdata/charts/config-ipv6.yaml +++ b/test/testdata/charts/config-ipv6.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -39,8 +40,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -75,8 +77,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -126,8 +129,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-rs.yaml b/test/testdata/charts/config-rs.yaml index ea2cf11c3..d284c8b81 100644 --- a/test/testdata/charts/config-rs.yaml +++ b/test/testdata/charts/config-rs.yaml @@ -1,6 +1,7 @@ manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: @@ -26,8 +27,9 @@ manager: verbose: true scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -56,8 +58,9 @@ scheduler: seedClient: enable: true replicas: 3 - image: dragonflyoss/client - tag: latest + image: + repository: dragonflyoss/client + tag: latest resources: requests: cpu: "0" @@ -86,8 +89,9 @@ seedClient: client: enable: true - image: dragonflyoss/client - tag: latest + image: + repository: dragonflyoss/client + tag: latest resources: requests: cpu: "0" diff --git a/test/testdata/charts/config-split-running-tasks.yaml b/test/testdata/charts/config-split-running-tasks.yaml index 6694a2841..255a5ae9b 100644 --- a/test/testdata/charts/config-split-running-tasks.yaml +++ b/test/testdata/charts/config-split-running-tasks.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -71,8 +73,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -121,8 +124,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config-write-buffer-size.yaml b/test/testdata/charts/config-write-buffer-size.yaml index 7cfc30704..cf916452e 100644 --- a/test/testdata/charts/config-write-buffer-size.yaml +++ b/test/testdata/charts/config-write-buffer-size.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -73,8 +75,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -124,8 +127,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: diff --git a/test/testdata/charts/config.yaml b/test/testdata/charts/config.yaml index b3c321e31..7e28071c4 100644 --- a/test/testdata/charts/config.yaml +++ b/test/testdata/charts/config.yaml @@ -1,6 +1,7 @@ scheduler: - image: dragonflyoss/scheduler - tag: latest + image: + repository: dragonflyoss/scheduler + tag: latest replicas: 3 resources: requests: @@ -37,8 +38,9 @@ scheduler: ttl: 5m seedPeer: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest replicas: 3 resources: requests: @@ -71,8 +73,9 @@ seedPeer: interval: 20s dfdaemon: - image: dragonflyoss/dfdaemon - tag: latest + image: + repository: dragonflyoss/dfdaemon + tag: latest resources: requests: cpu: "0" @@ -120,8 +123,9 @@ dfdaemon: interval: 20s manager: - image: dragonflyoss/manager - tag: latest + image: + repository: dragonflyoss/manager + tag: latest replicas: 1 resources: requests: