Merge pull request #1827 from kube-logging/feat/enable-adding-annotat…

…ions-and-labels-to-pvcs feat: enable adding annotations and labels to pvcs
kube-logging · Oct 11, 2024 · 835a4a9 · 835a4a9
2 parents fc01fc2 + 8f585f5
commit 835a4a9
Show file tree

Hide file tree

Showing 12 changed files with 281 additions and 10 deletions.
diff --git a/charts/logging-operator/crds/logging-extensions.banzaicloud.io_eventtailers.yaml b/charts/logging-operator/crds/logging-extensions.banzaicloud.io_eventtailers.yaml
@@ -409,6 +409,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
@@ -551,6 +551,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -1934,6 +1942,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -2120,6 +2136,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -541,6 +541,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -1239,6 +1247,14 @@ spec:
                           type: object
                         pvc:
                           properties:
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            labels:
+                              additionalProperties:
+                                type: string
+                              type: object
                             source:
                               properties:
                                 claimName:
@@ -1444,6 +1460,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -1598,6 +1598,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -2981,6 +2989,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -3167,6 +3183,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -4177,6 +4201,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -4875,6 +4907,14 @@ spec:
                               type: object
                             pvc:
                               properties:
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                labels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
                                 source:
                                   properties:
                                     claimName:
@@ -5080,6 +5120,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -8026,6 +8074,14 @@ spec:
                               type: object
                             pvc:
                               properties:
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                labels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
                                 source:
                                   properties:
                                     claimName:
@@ -12413,6 +12469,14 @@ spec:
                               type: object
                             pvc:
                               properties:
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                labels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
                                 source:
                                   properties:
                                     claimName:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml
@@ -121,6 +121,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:
@@ -4508,6 +4516,14 @@ spec:
                         type: object
                       pvc:
                         properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
                           source:
                             properties:
                               claimName:

diff --git a/config/crd/bases/logging-extensions.banzaicloud.io_eventtailers.yaml b/config/crd/bases/logging-extensions.banzaicloud.io_eventtailers.yaml
@@ -409,6 +409,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml b/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
@@ -551,6 +551,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -1934,6 +1942,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -2120,6 +2136,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml b/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -541,6 +541,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName:
@@ -1239,6 +1247,14 @@ spec:
                           type: object
                         pvc:
                           properties:
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            labels:
+                              additionalProperties:
+                                type: string
+                              type: object
                             source:
                               properties:
                                 claimName:
@@ -1444,6 +1460,14 @@ spec:
                     type: object
                   pvc:
                     properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       source:
                         properties:
                           claimName: