From 838df4eec4496868e772d5708e00f38bad478718 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 30 Mar 2018 05:49:37 -0400 Subject: Vendor in latest containers/image Some more features. docker-archive generates docker legacy compatible images Do not create $DiffID subdirectories for layers with no configs Ensure the layer IDs in legacy docker/tarfile metadata are unique docker-archive: repeated layers are symlinked in the tar file sysregistries: remove all trailing slashes Improve docker/* error messages Fix failure to make auth directory Create a new slice in Schema1.UpdateLayerInfos Drop unused storageImageDestination.{image,systemContext} Load a *storage.Image only once in storageImageSource Support gzip for docker-archive files Remove .tar extension from blob and config file names ostree, src: support copy of compressed layers ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size image: fix docker schema v1 -> OCI conversion Add /etc/containers/certs.d as default certs directory Signed-off-by: Daniel J Walsh Closes: #569 Approved by: mheon --- .../v1beta1/types_swagger_doc_generated.go | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 vendor/k8s.io/api/certificates/v1beta1/types_swagger_doc_generated.go (limited to 'vendor/k8s.io/api/certificates/v1beta1/types_swagger_doc_generated.go') diff --git a/vendor/k8s.io/api/certificates/v1beta1/types_swagger_doc_generated.go b/vendor/k8s.io/api/certificates/v1beta1/types_swagger_doc_generated.go deleted file mode 100644 index 4fd91df06..000000000 --- a/vendor/k8s.io/api/certificates/v1beta1/types_swagger_doc_generated.go +++ /dev/null @@ -1,74 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1beta1 - -// This file contains a collection of methods that can be used from go-restful to -// generate Swagger API documentation for its models. Please read this PR for more -// information on the implementation: https://github.com/emicklei/go-restful/pull/215 -// -// TODOs are ignored from the parser (e.g. TODO(andronat):... || TODO:...) if and only if -// they are on one line! For multiple line or blocks that you want to ignore use ---. -// Any context after a --- is ignored. -// -// Those methods can be generated by using hack/update-generated-swagger-docs.sh - -// AUTO-GENERATED FUNCTIONS START HERE -var map_CertificateSigningRequest = map[string]string{ - "": "Describes a certificate signing request", - "spec": "The certificate request itself and any additional information.", - "status": "Derived information about the request.", -} - -func (CertificateSigningRequest) SwaggerDoc() map[string]string { - return map_CertificateSigningRequest -} - -var map_CertificateSigningRequestCondition = map[string]string{ - "type": "request approval state, currently Approved or Denied.", - "reason": "brief reason for the request state", - "message": "human readable message with details about the request state", - "lastUpdateTime": "timestamp for the last update to this condition", -} - -func (CertificateSigningRequestCondition) SwaggerDoc() map[string]string { - return map_CertificateSigningRequestCondition -} - -var map_CertificateSigningRequestSpec = map[string]string{ - "": "This information is immutable after the request is created. Only the Request and Usages fields can be set on creation, other fields are derived by Kubernetes and cannot be modified by users.", - "request": "Base64-encoded PKCS#10 CSR data", - "usages": "allowedUsages specifies a set of usage contexts the key will be valid for. See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3\n https://tools.ietf.org/html/rfc5280#section-4.2.1.12", - "username": "Information about the requesting user. See user.Info interface for details.", - "uid": "UID information about the requesting user. See user.Info interface for details.", - "groups": "Group information about the requesting user. See user.Info interface for details.", - "extra": "Extra information about the requesting user. See user.Info interface for details.", -} - -func (CertificateSigningRequestSpec) SwaggerDoc() map[string]string { - return map_CertificateSigningRequestSpec -} - -var map_CertificateSigningRequestStatus = map[string]string{ - "conditions": "Conditions applied to the request, such as approval or denial.", - "certificate": "If request was approved, the controller will place the issued certificate here.", -} - -func (CertificateSigningRequestStatus) SwaggerDoc() map[string]string { - return map_CertificateSigningRequestStatus -} - -// AUTO-GENERATED FUNCTIONS END HERE -- cgit v1.2.3-54-g00ecf