improve yurtstaticset template metadata (#1591)

(cherry picked from commit 87772d9) Co-authored-by: JameKeal <[email protected]>
openyurtio · Jul 7, 2023 · 609469f · 609469f
1 parent 1896468
commit 609469f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/yurthub/templates/yurthub-cloud-yurtstaticset.yaml b/charts/yurthub/templates/yurthub-cloud-yurtstaticset.yaml
@@ -11,8 +11,6 @@ spec:
     metadata:
       labels:
         k8s-app: yurt-hub-cloud
-      name: yurt-hub-cloud
-      namespace: {{ .Release.Namespace }}
     spec:
       volumes:
         - name: hub-dir

diff --git a/charts/yurthub/templates/yurthub-yurtstaticset.yaml b/charts/yurthub/templates/yurthub-yurtstaticset.yaml
@@ -11,8 +11,6 @@ spec:
     metadata:
       labels:
         k8s-app: yurt-hub
-      name: yurt-hub
-      namespace: {{ .Release.Namespace }}
     spec:
       volumes:
         - name: hub-dir

diff --git a/pkg/apis/apps/v1alpha1/default.go b/pkg/apis/apps/v1alpha1/default.go
@@ -227,6 +227,10 @@ func SetDefaultsYurtStaticSet(obj *YurtStaticSet) {
 	if podSpec != nil {
 		SetDefaultPodSpec(podSpec)
 	}
+
+	// use YurtStaticSet name and namespace to replace name and namespace in template metadata
+	obj.Spec.Template.Name = obj.Name
+	obj.Spec.Template.Namespace = obj.Namespace
 }
 
 // SetDefaultsYurtAppDaemon set default values for YurtAppDaemon.