Merge pull request #1011 from cmi4/test

Add annotations to template metadata
grafana · Apr 24, 2023 · aa0a84b · aa0a84b
2 parents 4e96dde + 7bbb8d6
commit aa0a84b
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 2 deletions.
diff --git a/api/v1beta1/typeoverrides.go b/api/v1beta1/typeoverrides.go
@@ -80,7 +80,7 @@ type DeploymentV1PodTemplateSpec struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Specification of the desired behavior of the pod.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status

diff --git a/config/crd/bases/grafana.integreatly.org_grafanas.yaml b/config/crd/bases/grafana.integreatly.org_grafanas.yaml
@@ -117,6 +117,15 @@ spec:
                       template:
                         properties:
                           metadata:
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
                             type: object
                           spec:
                             properties:

diff --git a/config/grafana.integreatly.org_grafanas.yaml b/config/grafana.integreatly.org_grafanas.yaml
@@ -198,6 +198,15 @@ spec:
                           metadata:
                             description: 'Standard object''s metadata. More info:
                               https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
                             type: object
                           spec:
                             description: 'Specification of the desired behavior of

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml
@@ -117,6 +117,15 @@ spec:
                       template:
                         properties:
                           metadata:
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
                             type: object
                           spec:
                             properties:

diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
@@ -640,6 +640,15 @@ spec:
                           metadata:
                             description: 'Standard object''s metadata. More info:
                               https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
                             type: object
                           spec:
                             description: 'Specification of the desired behavior of

diff --git a/docs/docs/api.md b/docs/docs/api.md
@@ -1495,7 +1495,7 @@ Rolling update config params. Present only if DeploymentStrategyType = RollingUp
         </tr>
     </thead>
     <tbody><tr>
-        <td><b>metadata</b></td>
+        <td><b><a href="grafanaspecdeploymentspectemplatemetadata">metadata</a></b></td>
         <td>object</td>
         <td>
           Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata<br/>
@@ -1512,6 +1512,40 @@ Rolling update config params. Present only if DeploymentStrategyType = RollingUp
 </table>
 
 
+### Grafana.spec.deployment.spec.template.metadata
+<sup><sup>[↩ Parent](grafanaspecdeploymentspectemplate)</sup></sup>
+
+
+
+Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+
+<table>
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Required</th>
+        </tr>
+    </thead>
+    <tbody><tr>
+        <td><b>annotations</b></td>
+        <td>map[string]string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>labels</b></td>
+        <td>map[string]string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr></tbody>
+</table>
+
+
 ### Grafana.spec.deployment.spec.template.spec
 <sup><sup>[↩ Parent](grafanaspecdeploymentspectemplate)</sup></sup>