bugfix: fix jindoruntime name cannot contain jindofs (fluid-cloudnati…

…ve#4202) * bugfix: JindoRuntime cannot use a name containing "jindofs" Signed-off-by: trafalgarzzz <[email protected]> * todo: add todo for handling fullnameOverride Signed-off-by: trafalgarzzz <[email protected]> --------- Signed-off-by: trafalgarzzz <[email protected]> Signed-off-by: cheyang <[email protected]>
Ametsuji-akiya · Jul 16, 2024 · cd6570e · cd6570e
1 parent 4c497d3
commit cd6570e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 0 deletions.
diff --git a/pkg/ddc/alluxio/transform.go b/pkg/ddc/alluxio/transform.go
@@ -51,6 +51,7 @@ func (e *AlluxioEngine) transform(runtime *datav1alpha1.AlluxioRuntime) (value *
 		Owner: transformer.GenerateOwnerReferenceFromObject(runtime),
 	}
 
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = e.name
 
 	// 1.transform the common part

diff --git a/pkg/ddc/efc/transform.go b/pkg/ddc/efc/transform.go
@@ -46,6 +46,7 @@ func (e *EFCEngine) transform(runtime *datav1alpha1.EFCRuntime) (value *EFC, err
 		},
 	}
 
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = e.name
 
 	err = e.transformMasters(runtime, dataset, value)

diff --git a/pkg/ddc/goosefs/transform.go b/pkg/ddc/goosefs/transform.go
@@ -44,6 +44,7 @@ func (e *GooseFSEngine) transform(runtime *datav1alpha1.GooseFSRuntime) (value *
 
 	value = &GooseFS{}
 
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = e.name
 
 	// 1.transform the common part

diff --git a/pkg/ddc/jindocache/transform.go b/pkg/ddc/jindocache/transform.go
@@ -118,6 +118,9 @@ func (e *JindoCacheEngine) transform(runtime *datav1alpha1.JindoRuntime) (value
 	}
 
 	value = &Jindo{
+		// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
+		// TODO: refactor names of jindoruntime and make it aligned with other runtimes
+		FullnameOverride:    fmt.Sprintf("%s-%s", e.name, common.JindoChartName),
 		Image:               smartdataConfig.image,
 		ImageTag:            smartdataConfig.imageTag,
 		ImagePullPolicy:     smartdataConfig.imagePullPolicy,

diff --git a/pkg/ddc/jindocache/types.go b/pkg/ddc/jindocache/types.go
@@ -22,6 +22,7 @@ import (
 )
 
 type Jindo struct {
+	FullnameOverride    string                 `json:"fullnameOverride"`
 	Image               string                 `json:"image"`
 	ImageTag            string                 `json:"imageTag"`
 	ImagePullPolicy     string                 `json:"imagePullPolicy"`

diff --git a/pkg/ddc/jindofsx/transform.go b/pkg/ddc/jindofsx/transform.go
@@ -118,6 +118,9 @@ func (e *JindoFSxEngine) transform(runtime *datav1alpha1.JindoRuntime) (value *J
 	}
 
 	value = &Jindo{
+		// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
+		// TODO: refactor names of jindoruntime and make it aligned with other runtimes
+		FullnameOverride:    fmt.Sprintf("%s-%s", e.name, common.JindoChartName),
 		Image:               smartdataConfig.image,
 		ImageTag:            smartdataConfig.imageTag,
 		ImagePullPolicy:     smartdataConfig.imagePullPolicy,

diff --git a/pkg/ddc/jindofsx/types.go b/pkg/ddc/jindofsx/types.go
@@ -22,6 +22,7 @@ import (
 )
 
 type Jindo struct {
+	FullnameOverride    string                 `json:"fullnameOverride"`
 	Image               string                 `json:"image"`
 	ImageTag            string                 `json:"imageTag"`
 	ImagePullPolicy     string                 `json:"imagePullPolicy"`

diff --git a/pkg/ddc/juicefs/transform.go b/pkg/ddc/juicefs/transform.go
@@ -51,6 +51,7 @@ func (j *JuiceFSEngine) transform(runtime *datav1alpha1.JuiceFSRuntime) (value *
 		},
 	}
 
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = j.name
 	value.Owner = transformer.GenerateOwnerReferenceFromObject(runtime)
 

diff --git a/pkg/ddc/thin/transform.go b/pkg/ddc/thin/transform.go
@@ -46,6 +46,7 @@ func (t *ThinEngine) transform(runtime *datav1alpha1.ThinRuntime, profile *datav
 		},
 	}
 
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = t.name
 	value.Owner = transformer.GenerateOwnerReferenceFromObject(runtime)
 	toRuntimeSetConfig, err := t.toRuntimeSetConfig(nil, nil)

diff --git a/pkg/ddc/vineyard/transform.go b/pkg/ddc/vineyard/transform.go
@@ -40,6 +40,7 @@ func (e *VineyardEngine) transform(runtime *datav1alpha1.VineyardRuntime) (value
 	value = &Vineyard{
 		Owner: transformer.GenerateOwnerReferenceFromObject(runtime),
 	}
+	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
 	value.FullnameOverride = e.name
 
 	value.TieredStore, err = e.transformTieredStore(runtime)
-Original file line number
+Diff line change
@@ Expand Up @@
     		},
     	}
+    	// TODO: Handle cases that FullnameOverride is too long (> 63 chars)
     	value.FullnameOverride = e.name
     	err = e.transformMasters(runtime, dataset, value)
@@ Expand Down @@