Bump to Buildah v1.13.1

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>

1 files changed, 33 insertions, 44 deletions

diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
index ba36c3cd2..ba1194dcc 100644
--- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
@@ -163,6 +163,7 @@ message DeleteOptions {
 
   // Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be
   // returned.
+  // +k8s:conversion-gen=false
   // +optional
   optional Preconditions preconditions = 2;
 
@@ -212,7 +213,7 @@ message ExportOptions {
   optional bool exact = 2;
 }
 
-// Fields stores a set of fields in a data structure like a Trie.
+// FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
 //
 // Each key is either a '.' representing the field itself, and will always map to an empty set,
 // or a string representing a sub-field or item. The string will follow one of these four formats:
@@ -223,15 +224,9 @@ message ExportOptions {
 // If a key maps to an empty Fields value, the field that key represents is part of the set.
 //
 // The exact format is defined in sigs.k8s.io/structured-merge-diff
-// +protobuf.options.marshal=false
-// +protobuf.as=ProtoFields
-// +protobuf.options.(gogoproto.goproto_stringer)=false
-message Fields {
-  // Map is the representation used in the alpha version of this API
-  map<string, Fields> map = 1;
-
+message FieldsV1 {
   // Raw is the underlying serialization of this object.
-  optional bytes raw = 2;
+  optional bytes Raw = 1;
 }
 
 // GetOptions is the standard query options to the standard REST get call.
@@ -345,7 +340,7 @@ message LabelSelectorRequirement {
 // List holds a list of objects, which may not be known by the server.
 message List {
   // Standard list metadata.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   // +optional
   optional ListMeta metadata = 1;
 
@@ -371,7 +366,7 @@ message ListMeta {
   // Value must be treated as opaque by clients and passed unmodified back to the server.
   // Populated by the system.
   // Read-only.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
   // +optional
   optional string resourceVersion = 2;
 
@@ -393,9 +388,6 @@ message ListMeta {
   // Servers older than v1.15 do not set this field.
   // The intended use of the remainingItemCount is *estimating* the size of a collection. Clients
   // should not rely on the remainingItemCount to be set or to be exact.
-  //
-  // This field is alpha and can be changed or removed without notice.
-  //
   // +optional
   optional int64 remainingItemCount = 4;
 }
@@ -425,9 +417,6 @@ message ListOptions {
   // If this is not a watch, this field is ignored.
   // If the feature gate WatchBookmarks is not enabled in apiserver,
   // this field is ignored.
-  //
-  // This field is beta.
-  //
   // +optional
   optional bool allowWatchBookmarks = 9;
 
@@ -500,9 +489,13 @@ message ManagedFieldsEntry {
   // +optional
   optional Time time = 4;
 
-  // Fields identifies a set of fields.
+  // FieldsType is the discriminator for the different fields format and version.
+  // There is currently only one possible value: "FieldsV1"
+  optional string fieldsType = 6;
+
+  // FieldsV1 holds the first JSON version format as described in the "FieldsV1" type.
   // +optional
-  optional Fields fields = 5;
+  optional FieldsV1 fieldsV1 = 7;
 }
 
 // MicroTime is version of Time with microsecond level precision.
@@ -549,7 +542,7 @@ message ObjectMeta {
   // should retry (optionally after the time indicated in the Retry-After header).
   //
   // Applied only if Name is not specified.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
   // +optional
   optional string generateName = 2;
 
@@ -593,7 +586,7 @@ message ObjectMeta {
   // Populated by the system.
   // Read-only.
   // Value must be treated as opaque by clients and .
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
   // +optional
   optional string resourceVersion = 6;
 
@@ -609,7 +602,7 @@ message ObjectMeta {
   // Populated by the system.
   // Read-only.
   // Null for lists.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
   // +optional
   optional Time creationTimestamp = 8;
 
@@ -630,7 +623,7 @@ message ObjectMeta {
   //
   // Populated by the system when a graceful deletion is requested.
   // Read-only.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
   // +optional
   optional Time deletionTimestamp = 9;
 
@@ -668,6 +661,15 @@ message ObjectMeta {
   // is an identifier for the responsible component that will remove the entry
   // from the list. If the deletionTimestamp of the object is non-nil, entries
   // in this list can only be removed.
+  // Finalizers may be processed and removed in any order.  Order is NOT enforced
+  // because it introduces significant risk of stuck finalizers.
+  // finalizers is a shared field, any actor with permission can reorder it.
+  // If the finalizer list is processed in order, then this can lead to a situation
+  // in which the component responsible for the first finalizer in the list is
+  // waiting for a signal (field value, external system, or other) produced by a
+  // component responsible for a finalizer later in the list, resulting in a deadlock.
+  // Without enforced ordering finalizers are free to order amongst themselves and
+  // are not vulnerable to ordering changes in the list.
   // +optional
   // +patchStrategy=merge
   repeated string finalizers = 14;
@@ -686,8 +688,6 @@ message ObjectMeta {
   // "ci-cd". The set of fields is always in the version that the
   // workflow used when modifying the object.
   //
-  // This field is alpha and can be changed or removed without notice.
-  //
   // +optional
   repeated ManagedFieldsEntry managedFields = 17;
 }
@@ -700,7 +700,7 @@ message OwnerReference {
   optional string apiVersion = 5;
 
   // Kind of the referent.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   optional string kind = 1;
 
   // Name of the referent.
@@ -730,7 +730,7 @@ message OwnerReference {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 message PartialObjectMetadata {
   // Standard object's metadata.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
   // +optional
   optional ObjectMeta metadata = 1;
 }
@@ -739,7 +739,7 @@ message PartialObjectMetadata {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 message PartialObjectMetadataList {
   // Standard list metadata.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   // +optional
   optional ListMeta metadata = 1;
 
@@ -790,17 +790,6 @@ message Preconditions {
   optional string resourceVersion = 2;
 }
 
-// ProtoFields is a struct that is equivalent to Fields, but intended for
-// protobuf marshalling/unmarshalling. It is generated into a serialization
-// that matches Fields. Do not use in Go structs.
-message ProtoFields {
-  // Map is the representation used in the alpha version of this API
-  map<string, Fields> map = 1;
-
-  // Raw is the underlying serialization of this object.
-  optional bytes raw = 2;
-}
-
 // RootPaths lists the paths available at root.
 // For example: "/healthz", "/apis".
 message RootPaths {
@@ -821,13 +810,13 @@ message ServerAddressByClientCIDR {
 // Status is a return value for calls that don't return other objects.
 message Status {
   // Standard list metadata.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   // +optional
   optional ListMeta metadata = 1;
 
   // Status of the operation.
   // One of: "Success" or "Failure".
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
   // +optional
   optional string status = 2;
 
@@ -898,7 +887,7 @@ message StatusDetails {
 
   // The kind attribute of the resource associated with the status StatusReason.
   // On some operations may differ from the requested resource Kind.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   // +optional
   optional string kind = 3;
 
@@ -976,14 +965,14 @@ message TypeMeta {
   // Servers may infer this from the endpoint the client submits requests to.
   // Cannot be updated.
   // In CamelCase.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
   // +optional
   optional string kind = 1;
 
   // APIVersion defines the versioned schema of this representation of an object.
   // Servers should convert recognized schemas to the latest internal value, and
   // may reject unrecognized values.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
   // +optional
   optional string apiVersion = 2;
 }