Skip to content

Commit

Permalink
Add the tag v0.21.5 for vineyard worker and vineyard fuse image. (flu…
Browse files Browse the repository at this point in the history
…id-cloudnative#3767)

* Add the tag v0.21.5 for vineyard worker and vineyard fuse image.

Signed-off-by: Ye Cao <[email protected]>

* Update the version of vineyard chart to 0.21.5

Signed-off-by: Ye Cao <[email protected]>

---------

Signed-off-by: Ye Cao <[email protected]>
  • Loading branch information
dashanji authored Mar 21, 2024
1 parent 4fc0101 commit 2eb4a4f
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions api/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/v1alpha1/vineyardruntime_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type VineyardCompTemplateSpec struct {

// The image tag of Vineyard component.
// For Master, the default image tag is `3.5.10`.
// For Worker, the default image tag is `latest`.
// For Worker, the default image tag is `v0.21.5`.
// +optional
ImageTag string `json:"imageTag,omitempty"`

Expand Down Expand Up @@ -147,7 +147,7 @@ type VineyardSockSpec struct {
Image string `json:"image,omitempty"`

// Image Tag for Vineyard Fuse
// Default is `latest`
// Default is `v0.21.5`
// +optional
ImageTag string `json:"imageTag,omitempty"`

Expand Down
6 changes: 3 additions & 3 deletions charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
Available values are `Always`, `IfNotPresent`, `Never`
type: string
imageTag:
description: Image Tag for Vineyard Fuse Default is `latest`
description: Image Tag for Vineyard Fuse Default is `v0.21.5`
type: string
resources:
description: Resources contains the resource requirements and
Expand Down Expand Up @@ -217,7 +217,7 @@ spec:
imageTag:
description: The image tag of Vineyard component. For Master,
the default image tag is `3.5.10`. For Worker, the default image
tag is `latest`.
tag is `v0.21.5`.
type: string
nodeSelector:
additionalProperties:
Expand Down Expand Up @@ -3505,7 +3505,7 @@ spec:
imageTag:
description: The image tag of Vineyard component. For Master,
the default image tag is `3.5.10`. For Worker, the default image
tag is `latest`.
tag is `v0.21.5`.
type: string
nodeSelector:
additionalProperties:
Expand Down
2 changes: 1 addition & 1 deletion charts/vineyard/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
version: 0.19.3
version: 0.21.5
description: an In-Memory Data Manager for Data-Intensive Analytics
home: https://v6d.io/
keywords:
Expand Down
4 changes: 2 additions & 2 deletions charts/vineyard/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ master:
worker:
replicas: 1
image: vineyardcloudnative/vineyardd
imageTag: latest
imageTag: v0.21.5
imagePullPolicy: IfNotPresent
nodeSelector: {}
# Exmaple:
Expand Down Expand Up @@ -97,7 +97,7 @@ disablePrometheus: true

fuse:
image: vineyardcloudnative/vineyard-fluid-fuse
imageTag: latest
imageTag: v0.21.5
imagePullPolicy: IfNotPresent
env: {}
targetPath: ""
Expand Down
6 changes: 3 additions & 3 deletions config/crd/bases/data.fluid.io_vineyardruntimes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
Available values are `Always`, `IfNotPresent`, `Never`
type: string
imageTag:
description: Image Tag for Vineyard Fuse Default is `latest`
description: Image Tag for Vineyard Fuse Default is `v0.21.5`
type: string
resources:
description: Resources contains the resource requirements and
Expand Down Expand Up @@ -217,7 +217,7 @@ spec:
imageTag:
description: The image tag of Vineyard component. For Master,
the default image tag is `3.5.10`. For Worker, the default image
tag is `latest`.
tag is `v0.21.5`.
type: string
nodeSelector:
additionalProperties:
Expand Down Expand Up @@ -3505,7 +3505,7 @@ spec:
imageTag:
description: The image tag of Vineyard component. For Master,
the default image tag is `3.5.10`. For Worker, the default image
tag is `latest`.
tag is `v0.21.5`.
type: string
nodeSelector:
additionalProperties:
Expand Down
6 changes: 3 additions & 3 deletions docs/en/dev/api_doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -9879,7 +9879,7 @@ string
<em>(Optional)</em>
<p>The image tag of Vineyard component.
For Master, the default image tag is <code>3.5.10</code>.
For Worker, the default image tag is <code>latest</code>.</p>
For Worker, the default image tag is <code>v0.21.5</code>.</p>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -10177,7 +10177,7 @@ string
<td>
<em>(Optional)</em>
<p>Image Tag for Vineyard Fuse
Default is <code>latest</code></p>
Default is <code>v0.21.5</code></p>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -10308,5 +10308,5 @@ bool
<hr/>
<p><em>
Generated with <code>gen-crd-api-reference-docs</code>
on git commit <code>b9800030e</code>.
on git commit <code>4ca57673e</code>.
</em></p>
6 changes: 3 additions & 3 deletions docs/zh/dev/api_doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -9879,7 +9879,7 @@ string
<em>(Optional)</em>
<p>The image tag of Vineyard component.
For Master, the default image tag is <code>3.5.10</code>.
For Worker, the default image tag is <code>latest</code>.</p>
For Worker, the default image tag is <code>v0.21.5</code>.</p>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -10177,7 +10177,7 @@ string
<td>
<em>(Optional)</em>
<p>Image Tag for Vineyard Fuse
Default is <code>latest</code></p>
Default is <code>v0.21.5</code></p>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -10308,5 +10308,5 @@ bool
<hr/>
<p><em>
Generated with <code>gen-crd-api-reference-docs</code>
on git commit <code>b9800030e</code>.
on git commit <code>4ca57673e</code>.
</em></p>
4 changes: 2 additions & 2 deletions pkg/common/vineyard.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ const (

DefaultVineyardMasterImage = "bitnami/etcd:3.5.10"

DefaultVineyardWorkerImage = "vineyardcloudnative/vineyardd:latest"
DefaultVineyardWorkerImage = "vineyardcloudnative/vineyardd:v0.21.5"

DefultVineyardFuseImage = "vineyardcloudnative/vineyard-fluid-fuse:latest"
DefultVineyardFuseImage = "vineyardcloudnative/vineyard-fluid-fuse:v0.21.5"

VineyardEngineImpl = VineyardRuntime
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddc/vineyard/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ func TestParseWorkerImage(t *testing.T) {
imagePullPolicy: "",
engine: &VineyardEngine{},
wantImage: "vineyardcloudnative/vineyardd",
wantTag: "latest",
wantTag: "v0.21.5",
wantPolicy: "IfNotPresent",
},
}
Expand Down Expand Up @@ -505,7 +505,7 @@ func TestParseFuseImage(t *testing.T) {
imagePullPolicy: "",
engine: &VineyardEngine{},
wantImage: "vineyardcloudnative/vineyard-fluid-fuse",
wantTag: "latest",
wantTag: "v0.21.5",
wantPolicy: "IfNotPresent",
},
}
Expand Down

0 comments on commit 2eb4a4f

Please sign in to comment.