conflict

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

README.md

@@ -180,6 +180,4 @@ common issues and frequently asked questions (FAQ).
 
 ## Acknowledgements
 
-prometheus-operator organization logo was created and contributed by [Bianca Cheng Costanzo](https://github.com/bia).
-
-Rebuild Image: Wed Sep 7 14:48:45 EDT 2022
+prometheus-operator organization logo was created and contributed by [Bianca Cheng Costanzo](https://github.com/bia).

SECURITY.md

@@ -1,6 +1,5 @@
-# Security Response
+# Security
 
-If you've found a security issue that you'd like to disclose confidentially please contact Red Hat's Product Security team.
-Details at https://access.redhat.com/security/team/contact
-
-Build Date: Tue Jan 16 06:21:45 EST 2024
+If you find a security vulnerability related to the Prometheus Operator, please
+do not report it by opening a GitHub issue, but instead please send an e-mail to
+the maintainers of the project found in the [MAINTAINERS.md](MAINTAINERS.md) file.

jsonnet/prometheus-operator/alertmanagers-crd.json

@@ -4925,15 +4925,6 @@
                                 "type": "object",
                                 "x-kubernetes-map-type": "granular"
                               },
-                              "allocatedResourceStatuses": {
-                                "additionalProperties": {
-                                  "description": "When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource that it does not recognizes, then it should ignore that update and let other controllers handle it.",
-                                  "type": "string"
-                                },
-                                "description": "allocatedResourceStatuses stores status of resource being resized for the given PVC. Key names follow standard Kubernetes label syntax. Valid values are either: * Un-prefixed keys: - storage - the capacity of the volume. * Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\" Apart from above values - keys that are unprefixed or have kubernetes.io prefix are considered reserved and hence may not be used. \n ClaimResourceStatus can be in any of following states: - ControllerResizeInProgress: State set when resize controller starts resizing the volume in control-plane. - ControllerResizeFailed: State set when resize has failed in resize controller with a terminal error. - NodeResizePending: State set when resize controller has finished resizing the volume but further resizing of volume is needed on the node. - NodeResizeInProgress: State set when kubelet starts resizing the volume. - NodeResizeFailed: State set when resizing has failed in kubelet with a terminal error. Transient errors don't set NodeResizeFailed. For example: if expanding a PVC for more capacity - this field can be one of the following states: - pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeInProgress\" - pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeFailed\" - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizePending\" - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeInProgress\" - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeFailed\" When this field is not set, it means that no resize operation is in progress for the given PVC. \n A controller that receives PVC update with previously unknown resourceName or ClaimResourceStatus should ignore the update for the purpose it was designed. For example - a controller that only is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid resources associated with PVC. \n This is an alpha field and requires enabling RecoverVolumeExpansionFailure feature.",
-                                "type": "object",
-                                "x-kubernetes-map-type": "granular"
-                              },
                               "allocatedResources": {
                                 "additionalProperties": {
                                   "anyOf": [
@@ -6952,4 +6943,4 @@
       }
     ]
   }
-}
+}