From 44e8352d1e3f47f60cae25ebfc6fc590edfe5fa6 Mon Sep 17 00:00:00 2001
From: yangsoon <yangsoonlx@gmail.com>
Date: Fri, 25 Jun 2021 10:24:46 +0800
Subject: [PATCH] [FIX]incorrect pod-disruptive defalut configuration in label
 of traits (#1837) (#1844)

[FIX]incorrect pod-disruptive defalut configuration in sidecar of traits (#1839)

Fix incorrect pod disruptive annotation traits (#1838)

* [FIX]incorrect pod-disruptive defalut configuration in label of traits

* [FIX]incorrect pod-disruptive defalut configuration in annotation of traits

* [FIX]incorrect pod-disruptive defalut configuration in annotation of traits

Co-authored-by: Scaat Feng <scaat.feng@gmail.com>
---
 charts/vela-core/templates/defwithtemplate/annotations.yaml | 4 ++--
 charts/vela-core/templates/defwithtemplate/labels.yaml      | 4 ++--
 charts/vela-core/templates/defwithtemplate/sidecar.yaml     | 4 ++--
 hack/vela-templates/definitions/annotations.yaml            | 4 ++--
 hack/vela-templates/definitions/labels.yaml                 | 4 ++--
 hack/vela-templates/definitions/sidecar.yaml                | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/charts/vela-core/templates/defwithtemplate/annotations.yaml b/charts/vela-core/templates/defwithtemplate/annotations.yaml
index 504e2bf2c..259ddca4d 100644
--- a/charts/vela-core/templates/defwithtemplate/annotations.yaml
+++ b/charts/vela-core/templates/defwithtemplate/annotations.yaml
@@ -8,8 +8,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-
diff --git a/charts/vela-core/templates/defwithtemplate/labels.yaml b/charts/vela-core/templates/defwithtemplate/labels.yaml
index 8e738a486..17d0673b5 100644
--- a/charts/vela-core/templates/defwithtemplate/labels.yaml
+++ b/charts/vela-core/templates/defwithtemplate/labels.yaml
@@ -8,8 +8,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-
diff --git a/charts/vela-core/templates/defwithtemplate/sidecar.yaml b/charts/vela-core/templates/defwithtemplate/sidecar.yaml
index 5887654a4..ede4d54ae 100644
--- a/charts/vela-core/templates/defwithtemplate/sidecar.yaml
+++ b/charts/vela-core/templates/defwithtemplate/sidecar.yaml
@@ -8,8 +8,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-
diff --git a/hack/vela-templates/definitions/annotations.yaml b/hack/vela-templates/definitions/annotations.yaml
index 40bb182af..bc91d15ac 100644
--- a/hack/vela-templates/definitions/annotations.yaml
+++ b/hack/vela-templates/definitions/annotations.yaml
@@ -7,8 +7,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-
diff --git a/hack/vela-templates/definitions/labels.yaml b/hack/vela-templates/definitions/labels.yaml
index 64821a72e..cf30ac2f4 100644
--- a/hack/vela-templates/definitions/labels.yaml
+++ b/hack/vela-templates/definitions/labels.yaml
@@ -7,8 +7,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-
diff --git a/hack/vela-templates/definitions/sidecar.yaml b/hack/vela-templates/definitions/sidecar.yaml
index 812c03eda..9f25119d5 100644
--- a/hack/vela-templates/definitions/sidecar.yaml
+++ b/hack/vela-templates/definitions/sidecar.yaml
@@ -7,8 +7,8 @@ metadata:
   namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   appliesToWorkloads:
-    - webservice
-    - worker
+    - deployments.apps
+  podDisruptive: true
   schematic:
     cue:
       template: |-