Skip to content

Commit

Permalink
Revert "Make types on AdmissionRequest and AdmissionResponse pu…
Browse files Browse the repository at this point in the history
…blic (kube-rs#977)"

This reverts commit bf885f0.
  • Loading branch information
JuyunLee committed Aug 12, 2022
1 parent 25c9b44 commit 082724e
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions kube-core/src/admission.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ pub const META_API_VERSION_V1BETA1: &str = "admission.k8s.io/v1beta1";

/// The top level struct used for Serializing and Deserializing AdmissionReview
/// requests and responses.
///
/// This is both the input type received by admission controllers, and the
/// output type admission controllers should return.
///
/// An admission controller should start by inspecting the [`AdmissionRequest`].
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(rename_all = "camelCase")]
pub struct AdmissionReview<T: Resource> {
Expand Down Expand Up @@ -75,32 +70,20 @@ impl<T: Resource> TryInto<AdmissionRequest<T>> for AdmissionReview<T> {
}

/// An incoming [`AdmissionReview`] request.
///
/// In an admission controller scenario, this is extracted from an [`AdmissionReview`] via [`TryInto`]
///
/// ```ignore
/// use kube::api::{admission::{AdmissionRequest, AdmissionReview}, DynamicObject};
///
/// // The incoming AdmissionReview received by the controller.
/// let body: AdmissionReview<DynamicObject>;
/// let req: AdmissionRequest<_> = body.try_into().unwrap();
/// ```
///
/// Based on the contents of the request, an admission controller should construct an
/// [`AdmissionResponse`] using:
///
/// - [`AdmissionResponse::deny`] for illegal/rejected requests
/// - [`AdmissionResponse::invalid`] for malformed requests
/// - [`AdmissionResponse::from`] for the happy path
///
/// then wrap the chosen response in an [`AdmissionReview`] via [`AdmissionResponse::into_review`].
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(rename_all = "camelCase")]
pub struct AdmissionRequest<T: Resource> {
/// Copied from the containing [`AdmissionReview`] and used to specify a
/// response type and version when constructing an [`AdmissionResponse`].
#[serde(skip)]
pub types: TypeMeta,
types: TypeMeta,
/// An identifier for the individual request/response. It allows us to
/// distinguish instances of requests which are otherwise identical (parallel
/// requests, requests when earlier requests did not modify, etc). The UID is
Expand Down Expand Up @@ -242,7 +225,7 @@ pub enum Operation {
pub struct AdmissionResponse {
/// Copied from the corresponding consructing [`AdmissionRequest`].
#[serde(skip)]
pub types: TypeMeta,
types: TypeMeta,
/// Identifier for the individual request/response. This must be copied over
/// from the corresponding AdmissionRequest.
pub uid: String,
Expand Down

0 comments on commit 082724e

Please sign in to comment.