Merge pull request #3675 from shanewxy/config-map

Enable add labels and annotations while adding Secret and Config Maps

app/components/cru-config-map/template.hbs

@@ -58,6 +58,16 @@
   }}
 </div>
 
+<div class="row mt-20">
+  <FormLabelsAnnotations
+    @classNames="accordion-wrapper"
+    @expandAll={{al.expandAll}}
+    @initialLabels={{primaryResource.labels}}
+    @model={{primaryResource}}
+    @editing={{notView}}
+  />
+</div>
+
 {{#accordion-list showExpandAll=false as | al expandFn |}}
   {{#if isView}}
     {{form-related-workloads

app/components/cru-secret/template.hbs

@@ -57,6 +57,16 @@
   }}
 </div>
 
+<div class="row mt-20">
+  <FormLabelsAnnotations
+    @classNames="accordion-wrapper"
+    @expandAll={{al.expandAll}}
+    @initialLabels={{primaryResource.labels}}
+    @model={{primaryResource}}
+    @editing={{editing}}
+  />
+</div>
+
 {{#accordion-list showExpandAll=false as | al expandFn |}}
   {{#if isView}}
     {{form-related-workloads

app/models/configmap.js

@@ -9,10 +9,10 @@ export default Resource.extend({
   router:       service(),
   clusterStore: service(),
 
-  state:        'active',
-  canClone:     true,
-
-  namespace: reference('namespaceId', 'namespace', 'clusterStore'),
+  state:         'active',
+  canClone:      true,
+  canHaveLabels:  true,
+  namespace:     reference('namespaceId', 'namespace', 'clusterStore'),
 
   firstKey:  alias('keys.firstObject'),
 

app/models/secret.js

@@ -7,11 +7,11 @@ export default Resource.extend({
   router:       service(),
   allWorkloads: service(),
 
-  state:    'active',
-  canClone: true,
-
-  firstKey: alias('keys.firstObject'),
-  keys:     computed('data', function() {
+  state:         'active',
+  canClone:      true,
+  canHaveLabels: true,
+  firstKey:      alias('keys.firstObject'),
+  keys:          computed('data', function() {
     return Object.keys(get(this, 'data') || {}).sort();
   }),